Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs
===================================================================
diff -u -rf839333e4a2224a91cf76a79aeea2ab0b449f1b0 -r782024fce80b8d92ae6fad70a1d27620540f1f3e
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs	(.../FailureMechanismSectionAssemblyKernelStubTest.cs)	(revision f839333e4a2224a91cf76a79aeea2ab0b449f1b0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs	(.../FailureMechanismSectionAssemblyKernelStubTest.cs)	(revision 782024fce80b8d92ae6fad70a1d27620540f1f3e)
@@ -1244,9 +1244,9 @@
         {
             // Setup
             var random = new Random(11);
-            var simpleAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble());
-            var detailedAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble());
-            var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble());
+            var simpleAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
+            var detailedAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
+            var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
 
             var kernel = new FailureMechanismSectionAssemblyKernelStub();
 
@@ -1265,18 +1265,18 @@
         {
             // Setup
             var random = new Random(11);
-            var simpleAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble());
-            var detailedAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble());
-            var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble());
+            var simpleAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
+            var detailedAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
+            var tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
 
             var kernel = new FailureMechanismSectionAssemblyKernelStub
             {
-                FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(
+                FailureMechanismAssessmentResult = new FmSectionAssemblyDirectResult(
                     random.NextEnumValue<EFmSectionCategory>())
             };
 
             // Call
-            var result = (FmSectionAssemblyDirectResult) kernel.TranslateAssessmentResultWbi0A1(
+            FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0A1(
                 simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult);
 
             // Assert
@@ -1295,9 +1295,9 @@
 
             // Call
             TestDelegate test = () => kernel.TranslateAssessmentResultWbi0A1(
-                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble()),
-                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble()),
-                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble()));
+                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>()),
+                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>()),
+                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>()));
 
             // Assert
             var exception = Assert.Throws<Exception>(test);
@@ -1307,38 +1307,10 @@
             Assert.IsNull(kernel.DetailedAssessmentResultInput);
             Assert.IsNull(kernel.TailorMadeAssessmentResultInput);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionDirectResult);
+            Assert.IsNull(kernel.FailureMechanismAssessmentResult);
         }
 
         [Test]
-        public void TranslateAssessmentResultWbi0A1_WithDirectResultAndThrowAssemblyExceptionOnCalculateTrue_ThrowsAssemblyException()
-        {
-            // Setup
-            var random = new Random(11);
-            var kernel = new FailureMechanismSectionAssemblyKernelStub
-            {
-                ThrowAssemblyExceptionOnCalculate = true
-            };
-
-            // Call
-            TestDelegate test = () => kernel.TranslateAssessmentResultWbi0A1(
-                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble()),
-                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble()),
-                new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble()));
-
-            // Assert
-            var exception = Assert.Throws<AssemblyException>(test);
-            AssemblyErrorMessage errorMessage = exception.Errors.Single();
-            Assert.AreEqual("entity", errorMessage.EntityId);
-            Assert.AreEqual(EAssemblyErrors.CategoryLowerLimitOutOfRange, errorMessage.ErrorCode);
-            Assert.IsNull(kernel.SimpleAssessmentResultInput);
-            Assert.IsNull(kernel.DetailedAssessmentResultInput);
-            Assert.IsNull(kernel.TailorMadeAssessmentResultInput);
-            Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionDirectResult);
-        }
-
-        [Test]
         public void TranslateAssessmentResultWbi0A1_WithIndirectResult_ThrowNotImplementedException()
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs
===================================================================
diff -u -rf839333e4a2224a91cf76a79aeea2ab0b449f1b0 -r782024fce80b8d92ae6fad70a1d27620540f1f3e
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision f839333e4a2224a91cf76a79aeea2ab0b449f1b0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision 782024fce80b8d92ae6fad70a1d27620540f1f3e)
@@ -26,7 +26,6 @@
 using Assembly.Kernel.Model.AssessmentResultTypes;
 using Assembly.Kernel.Model.CategoryLimits;
 using Assembly.Kernel.Model.FmSectionTypes;
-using Ringtoets.AssemblyTool.Data;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
@@ -142,6 +141,11 @@
         public FmSectionAssemblyDirectResultWithProbability FailureMechanismAssemblyDirectResultWithProbability { get; set; }
 
         /// <summary>
+        /// Gets or sets the failure mechanism section assembly result.
+        /// </summary>
+        public IFmSectionAssemblyResult FailureMechanismAssessmentResult { get; set; }
+
+        /// <summary>
         /// Gets a value indicating whether a calculation was called or not.
         /// </summary>
         public bool Calculated { get; private set; }
@@ -321,27 +325,21 @@
             return FailureMechanismSectionDirectResult;
         }
 
-        public FmSectionAssemblyResult TranslateAssessmentResultWbi0A1(FmSectionAssemblyDirectResult simpleAssessmentResult,
-                                                                       FmSectionAssemblyDirectResult detailedAssessmentResult,
-                                                                       FmSectionAssemblyDirectResult tailorMadeAssessmentResult)
+        public TResult TranslateAssessmentResultWbi0A1<TResult>(TResult simpleAssessmentResult,
+                                                                TResult detailedAssessmentResult,
+                                                                TResult customAssessmentResult)
+            where TResult : IFmSectionAssemblyResult
         {
             ThrowException();
 
-            SimpleAssessmentResultInput = simpleAssessmentResult;
-            DetailedAssessmentResultInput = detailedAssessmentResult;
-            TailorMadeAssessmentResultInput = tailorMadeAssessmentResult;
+            SimpleAssessmentResultInput = simpleAssessmentResult as FmSectionAssemblyDirectResult;
+            DetailedAssessmentResultInput = detailedAssessmentResult as FmSectionAssemblyDirectResult;
+            TailorMadeAssessmentResultInput = customAssessmentResult as FmSectionAssemblyDirectResult;
 
             Calculated = true;
-            return FailureMechanismSectionDirectResult;
+            return (TResult) FailureMechanismAssessmentResult;
         }
 
-        public FmSectionAssemblyResult TranslateAssessmentResultWbi0A1(FmSectionAssemblyIndirectResult simpleAssessmentResult,
-                                                                       FmSectionAssemblyIndirectResult detailedAssessmentResult,
-                                                                       FmSectionAssemblyIndirectResult customAssessmentResult)
-        {
-            throw new NotImplementedException();
-        }
-
         private void ThrowException()
         {
             if (ThrowExceptionOnCalculate)