Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r03a42f53227ba94fae59ac8a103861e201138398 -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 03a42f53227ba94fae59ac8a103861e201138398)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -55,15 +55,14 @@
         }
 
         public FailureMechanismAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
-                                                                   double signalingNorm,
-                                                                   double lowerLimitNorm)
+                                                                  double signalingNorm,
+                                                                  double lowerLimitNorm)
         {
             try
             {
-                
                 ICategoryLimitsCalculator categoriesKernel = factory.CreateAssemblyCategoriesKernel();
                 CategoriesList<FailureMechanismCategory> categories = categoriesKernel.CalculateFailureMechanismCategoryLimitsWbi11(
-                    new AssessmentSection(1, signalingNorm, lowerLimitNorm), 
+                    new AssessmentSection(1, signalingNorm, lowerLimitNorm),
                     new FailureMechanism(1, 0.54));
 
                 IAssessmentGradeAssembler kernel = factory.CreateAssessmentSectionAssemblyKernel();
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r7e5af14aa300d545f2dec663cd4dd13ad66ab1e0 -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 7e5af14aa300d545f2dec663cd4dd13ad66ab1e0)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -139,7 +139,7 @@
 
         public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
                                                                           double probability,
-                                                                          double normativeNorm, 
+                                                                          double normativeNorm,
                                                                           double failureMechanismN,
                                                                           double failureMechanismContribution)
         {
@@ -204,16 +204,11 @@
         {
             try
             {
-                ICategoryLimitsCalculator categoriesKernel = factory.CreateAssemblyCategoriesKernel();
-                CategoriesList<FmSectionCategory> categories = categoriesKernel.CalculateFmSectionCategoryLimitsWbi01(
-                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
-                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution));
-
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResultWithProbability output =
                     kernel.TranslateAssessmentResultWbi0G3(GetAssessmentResultTypeG2(detailedAssessmentResult, probability),
                                                            probability,
-                                                           categories);
+                                                           GetWbi01Categories(assemblyCategoriesInput));
 
                 return FailureMechanismSectionAssemblyCreator.Create(output);
             }
@@ -234,16 +229,11 @@
         {
             try
             {
-                ICategoryLimitsCalculator categoriesKernel = factory.CreateAssemblyCategoriesKernel();
-                CategoriesList<FmSectionCategory> categories = categoriesKernel.CalculateFmSectionCategoryLimitsWbi01(
-                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
-                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution));
-
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResultWithProbability output = kernel.TranslateAssessmentResultWbi0G5(failureMechanismSectionN,
                                                                                                              GetAssessmentResultTypeG2(detailedAssessmentResult, probability),
                                                                                                              probability,
-                                                                                                             categories);
+                                                                                                             GetWbi01Categories(assemblyCategoriesInput));
 
                 return FailureMechanismSectionAssemblyCreator.Create(output);
             }
@@ -327,18 +317,13 @@
         {
             try
             {
-                ICategoryLimitsCalculator categoriesKernel = factory.CreateAssemblyCategoriesKernel();
-                CategoriesList<FmSectionCategory> categories = categoriesKernel.CalculateFmSectionCategoryLimitsWbi01(
-                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
-                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution));
-
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResultWithProbability output = kernel.TranslateAssessmentResultWbi0T3(
                     double.IsNaN(probability) && tailorMadeAssessmentResult == TailorMadeAssessmentProbabilityCalculationResultType.Probability
                         ? EAssessmentResultTypeT3.Gr
                         : FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult),
                     probability,
-                    categories);
+                    GetWbi01Categories(assemblyCategoriesInput));
 
                 return FailureMechanismSectionAssemblyCreator.Create(output);
             }
@@ -352,26 +337,29 @@
             }
         }
 
+        private CategoriesList<FmSectionCategory> GetWbi01Categories(AssemblyCategoriesInput assemblyCategoriesInput)
+        {
+            ICategoryLimitsCalculator categoriesKernel = factory.CreateAssemblyCategoriesKernel();
+            return categoriesKernel.CalculateFmSectionCategoryLimitsWbi01(
+                new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+                new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution));
+        }
+
         public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
                                                                             double probability,
                                                                             double failureMechanismSectionN,
                                                                             AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
-                ICategoryLimitsCalculator categoriesKernel = factory.CreateAssemblyCategoriesKernel();
-                CategoriesList<FmSectionCategory> categories = categoriesKernel.CalculateFmSectionCategoryLimitsWbi01(
-                    new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
-                    new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution));
-
                 IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
                 FmSectionAssemblyDirectResultWithProbability output = kernel.TranslateAssessmentResultWbi0T5(
                     failureMechanismSectionN,
                     double.IsNaN(probability) && tailorMadeAssessmentResult == TailorMadeAssessmentProbabilityCalculationResultType.Probability
                         ? EAssessmentResultTypeT3.Gr
                         : FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult),
                     probability,
-                    categories);
+                    GetWbi01Categories(assemblyCategoriesInput));
 
                 return FailureMechanismSectionAssemblyCreator.Create(output);
             }
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -rd100891e1e3198966bf906399f570a1e1c0849fb -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision d100891e1e3198966bf906399f570a1e1c0849fb)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -35,7 +35,7 @@
         /// <param name="input">The collection of failure mechanism assemblies to assemble for.</param>
         /// <param name="signalingNorm">The signaling norm to calculate with.</param>
         /// <param name="lowerLimitNorm">The lower limit norm to calculate with.</param>
-        /// <returns>An <see cref="FailureMechanismAssembly"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismAssembly"/>.</returns>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
         FailureMechanismAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
@@ -47,7 +47,7 @@
         /// </summary>
         /// <param name="input">The collection of failure mechanism assembly category groups
         /// to assemble for.</param>
-        /// <returns>An <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
         FailureMechanismAssemblyCategoryGroup AssembleFailureMechanisms(IEnumerable<FailureMechanismAssemblyCategoryGroup> input);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r7e5af14aa300d545f2dec663cd4dd13ad66ab1e0 -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 7e5af14aa300d545f2dec663cd4dd13ad66ab1e0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -86,17 +86,27 @@
 
         private static void AssertAssemblyCategoriesInput(AssemblyCategoriesInput assemblyCategoriesInput,
                                                           AssemblyCategoriesKernelStub categoriesKernel,
-                                                          CategoriesList<FmSectionCategory> categories,
                                                           FailureMechanismSectionAssemblyKernelStub kernel)
         {
             Assert.AreEqual(assemblyCategoriesInput.SignalingNorm, categoriesKernel.SignalingNorm);
             Assert.AreEqual(assemblyCategoriesInput.LowerLimitNorm, categoriesKernel.LowerLimitNorm);
             Assert.AreEqual(assemblyCategoriesInput.N, categoriesKernel.N);
             Assert.AreEqual(assemblyCategoriesInput.FailureMechanismContribution, categoriesKernel.FailureMechanismContribution);
 
-            Assert.AreSame(categories, kernel.FailureMechanismSectionCategories);
+            Assert.AreSame(categoriesKernel.FailureMechanismSectionCategoriesOutput, kernel.FailureMechanismSectionCategories);
         }
 
+        private static void AssertAssemblyCategoriesInput(double normativeNorm,
+                                                          double n, double failureMechanismContribution,
+                                                          AssemblyCategoriesKernelStub categoriesKernel,
+                                                          FailureMechanismSectionAssemblyKernelStub kernel)
+        {
+            Assert.AreEqual(normativeNorm, categoriesKernel.AssessmentSectionNorm);
+            Assert.AreEqual(n, categoriesKernel.N);
+            Assert.AreEqual(failureMechanismContribution, categoriesKernel.FailureMechanismContribution);
+            Assert.AreSame(categoriesKernel.FailureMechanismCategoriesOutput, kernel.FailureMechanismSectionCategories);
+        }
+
         private static AssemblyCategoriesInput CreateAssemblyCategoriesInput()
         {
             var random = new Random(39);
@@ -571,7 +581,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -592,7 +602,6 @@
 
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -608,7 +617,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -628,7 +637,6 @@
 
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -780,7 +788,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -797,10 +805,7 @@
                     failureMechanismContribution);
 
                 // Assert
-                Assert.AreEqual(normativeNorm, categoriesKernel.AssessmentSectionNorm);
-                Assert.AreEqual(n, categoriesKernel.N);
-                Assert.AreEqual(failureMechanismContribution, categoriesKernel.FailureMechanismContribution);
-                Assert.AreSame(categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02, kernel.FailureMechanismSectionCategories);
+                AssertAssemblyCategoriesInput(normativeNorm, n, failureMechanismContribution, categoriesKernel, kernel);
 
                 EAssessmentResultTypeG2 expectedResultType = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessment);
                 Assert.AreEqual(expectedResultType, kernel.AssessmentResultTypeG2Input);
@@ -821,7 +826,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -838,11 +843,8 @@
                     failureMechanismContribution);
 
                 // Assert
-                Assert.AreEqual(normativeNorm, categoriesKernel.AssessmentSectionNorm);
-                Assert.AreEqual(n, categoriesKernel.N);
-                Assert.AreEqual(failureMechanismContribution, categoriesKernel.FailureMechanismContribution);
-                Assert.AreSame(categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02, kernel.FailureMechanismSectionCategories);
-                
+                AssertAssemblyCategoriesInput(normativeNorm, n, failureMechanismContribution, categoriesKernel, kernel);
+
                 Assert.IsNaN(kernel.FailureProbabilityInput);
                 Assert.AreEqual(EAssessmentResultTypeG2.Gr, kernel.AssessmentResultTypeG2Input);
             }
@@ -1001,7 +1003,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -1023,7 +1025,6 @@
                 Assert.AreEqual(expectedResultType, kernel.AssessmentResultTypeG2Input);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -1040,7 +1041,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -1061,7 +1062,6 @@
                 Assert.AreEqual(EAssessmentResultTypeG2.Gr, kernel.AssessmentResultTypeG2Input);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -1566,7 +1566,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
@@ -1577,11 +1577,8 @@
                 calculator.AssembleTailorMadeAssessment(tailorMadeAssessmentResult, probability, normativeNorm, n, failureMechanismContribution);
 
                 // Assert
-                Assert.AreEqual(normativeNorm, categoriesKernel.AssessmentSectionNorm);
-                Assert.AreEqual(n, categoriesKernel.N);
-                Assert.AreEqual(failureMechanismContribution, categoriesKernel.FailureMechanismContribution);
+                AssertAssemblyCategoriesInput(normativeNorm, n, failureMechanismContribution, categoriesKernel, kernel);
 
-                Assert.AreSame(categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02, kernel.FailureMechanismSectionCategories);
                 EAssessmentResultTypeT4 expectedResultType = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT4(tailorMadeAssessmentResult);
                 Assert.AreEqual(expectedResultType, kernel.AssessmentResultTypeT4Input);
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
@@ -1601,7 +1598,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue<EFmSectionCategory>());
@@ -1616,11 +1613,8 @@
                                                         failureMechanismContribution);
 
                 // Assert
-                Assert.AreEqual(normativeNorm, categoriesKernel.AssessmentSectionNorm);
-                Assert.AreEqual(n, categoriesKernel.N);
-                Assert.AreEqual(failureMechanismContribution, categoriesKernel.FailureMechanismContribution);
+                AssertAssemblyCategoriesInput(normativeNorm, n, failureMechanismContribution, categoriesKernel, kernel);
 
-                Assert.AreSame(categoriesKernel.FailureMechanismSectionCategoriesOutputWbi02, kernel.FailureMechanismSectionCategories);
                 Assert.AreEqual(EAssessmentResultTypeT4.Gr, kernel.AssessmentResultTypeT4Input);
                 Assert.IsNaN(kernel.FailureProbabilityInput);
             }
@@ -1775,7 +1769,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -1792,7 +1786,6 @@
                 Assert.AreEqual(probability, kernel.FailureProbabilityInput);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -1808,7 +1801,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -1826,7 +1819,6 @@
                 Assert.IsNaN(kernel.FailureProbabilityInput);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -1976,7 +1968,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -1994,7 +1986,6 @@
                 Assert.AreEqual(n, kernel.LengthEffectFactorInput);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -2011,7 +2002,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -2031,7 +2022,6 @@
                 Assert.AreEqual(n, kernel.LengthEffectFactorInput);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -3099,7 +3089,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -3115,7 +3105,6 @@
                 Assert.AreEqual(EAssessmentResultTypeG2.ResultSpecified, kernel.AssessmentResultTypeG2Input);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
 
             }
@@ -3132,7 +3121,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -3148,7 +3137,6 @@
                 Assert.AreEqual(EAssessmentResultTypeG2.Gr, kernel.AssessmentResultTypeG2Input);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -3261,7 +3249,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -3281,7 +3269,6 @@
                 Assert.AreEqual(EAssessmentResultTypeG2.ResultSpecified, kernel.AssessmentResultTypeG2Input);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
@@ -3298,7 +3285,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub categoriesKernel = factory.LastCreatedAssemblyCategoriesKernel;
-                categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue<EFmSectionCategory>(),
@@ -3315,7 +3302,6 @@
                 Assert.AreEqual(EAssessmentResultTypeG2.Gr, kernel.AssessmentResultTypeG2Input);
                 AssertAssemblyCategoriesInput(assemblyCategoriesInput,
                                               categoriesKernel,
-                                              categoriesKernel.FailureMechanismSectionCategoriesOutputWbi01,
                                               kernel);
             }
         }
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs
===================================================================
diff -u -r2b1d86d311c8de3975d9f3463c71f9d6101b15f5 -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 2b1d86d311c8de3975d9f3463c71f9d6101b15f5)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -278,7 +278,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
-                kernel.FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                kernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 var calculator = new AssemblyCategoriesCalculator(factory);
 
@@ -303,7 +303,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
-                kernel.FailureMechanismSectionCategoriesOutputWbi01 = output;
+                kernel.FailureMechanismSectionCategoriesOutput = output;
 
                 var calculator = new AssemblyCategoriesCalculator(factory);
 
@@ -378,7 +378,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
-                kernel.FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+                kernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
 
                 var calculator = new AssemblyCategoriesCalculator(factory);
 
@@ -405,7 +405,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
-                kernel.FailureMechanismSectionCategoriesOutputWbi02 = output;
+                kernel.FailureMechanismSectionCategoriesOutput = output;
 
                 var calculator = new AssemblyCategoriesCalculator(factory);
 
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r9e950b45403740c6bf9146b5f0cdc2ba726462be -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision 9e950b45403740c6bf9146b5f0cdc2ba726462be)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -64,6 +64,10 @@
                             calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
             Assert.IsNull(calculator.TailorMadeAssessmentAssemblyOutput);
 
+            Assert.AreEqual(0.0, calculator.TailorMadeAssessmentFailureMechanismContributionInput);
+            Assert.AreEqual(0.0, calculator.TailorMadeAssessmentFailureMechanismNInput);
+            Assert.AreEqual(0.0, calculator.TailorMadeAssessmentNormativeNormInput);
+
             Assert.IsNull(calculator.CombinedSimpleAssemblyInput);
             Assert.IsNull(calculator.CombinedDetailedAssemblyInput);
             Assert.IsNull(calculator.CombinedTailorMadeAssemblyInput);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs
===================================================================
diff -u -r4c78adc6aba8a1a80c45f01515d97c84224ba56d -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -50,8 +50,7 @@
             Assert.IsFalse(kernel.Calculated);
 
             Assert.IsNull(kernel.AssessmentSectionCategoriesOutput);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi01);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi02);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
             Assert.IsNull(kernel.FailureMechanismCategoriesOutput);
         }
 
@@ -262,7 +261,7 @@
             // Setup
             var kernel = new AssemblyCategoriesKernelStub
             {
-                FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories()
+                FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories()
             };
 
             // Call
@@ -271,7 +270,7 @@
                 CreateValidFailureMechanism());
 
             // Assert
-            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutputWbi01, output);
+            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutput, output);
         }
 
         [Test]
@@ -296,7 +295,7 @@
             Assert.AreEqual("Message", exception.Message);
             Assert.IsNotNull(exception.InnerException);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi01);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
         }
 
         [Test]
@@ -322,7 +321,7 @@
             Assert.AreEqual("entity", errorMessage.EntityId);
             Assert.AreEqual(EAssemblyErrors.CategoryLowerLimitOutOfRange, errorMessage.ErrorCode);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi01);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
         }
 
         [Test]
@@ -357,7 +356,7 @@
             var random = new Random(21);
             var kernel = new AssemblyCategoriesKernelStub
             {
-                FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories()
+                FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories()
             };
 
             // Call
@@ -366,7 +365,7 @@
                 CreateValidFailureMechanism());
 
             // Assert
-            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutputWbi02, output);
+            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutput, output);
         }
 
         [Test]
@@ -392,7 +391,7 @@
             Assert.AreEqual("Message", exception.Message);
             Assert.IsNotNull(exception.InnerException);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi02);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
         }
 
         [Test]
@@ -419,7 +418,7 @@
             Assert.AreEqual("entity", errorMessage.EntityId);
             Assert.AreEqual(EAssemblyErrors.CategoryLowerLimitOutOfRange, errorMessage.ErrorCode);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi02);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
         }
 
         private static FailureMechanism CreateValidFailureMechanism()
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj
===================================================================
diff -u -r4c78adc6aba8a1a80c45f01515d97c84224ba56d -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -41,10 +41,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs
===================================================================
diff -u -r03a42f53227ba94fae59ac8a103861e201138398 -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs	(.../CombinedFailureMechanismSectionsInputAssert.cs)	(revision 03a42f53227ba94fae59ac8a103861e201138398)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs	(.../CombinedFailureMechanismSectionsInputAssert.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -63,7 +63,7 @@
             CollectionAssert.AreEqual(originalSections.Select(s => s.SectionEnd), failureMechanismSections.Select(r => r.SectionEnd));
             CollectionAssert.AreEqual(originalSections.Select(s => ConvertCategoryGroup(s.CategoryGroup)),
                                       failureMechanismSections.Select(r => (FmSectionWithDirectCategory) r)
-                                                             .Select(category => category.Category));
+                                                              .Select(category => category.Category));
         }
 
         private static EFmSectionCategory ConvertCategoryGroup(FailureMechanismSectionAssemblyCategoryGroup categoryGroup)
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs
===================================================================
diff -u -r4c78adc6aba8a1a80c45f01515d97c84224ba56d -r027a320bc8caa145acdbf284d3d9c54f61c2d07b
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b)
@@ -83,15 +83,10 @@
         public CategoriesList<FailureMechanismCategory> FailureMechanismCategoriesOutput { get; set; }
 
         /// <summary>
-        /// Gets or sets the failure mechanism section categories output for WBI-01.
+        /// Gets or sets the failure mechanism section categories output.
         /// </summary>
-        public CategoriesList<FmSectionCategory> FailureMechanismSectionCategoriesOutputWbi01 { get; set; }
+        public CategoriesList<FmSectionCategory> FailureMechanismSectionCategoriesOutput { get; set; }
 
-        /// <summary>
-        /// Gets or sets the failure mechanism section categories output for WBI-02.
-        /// </summary>
-        public CategoriesList<FmSectionCategory> FailureMechanismSectionCategoriesOutputWbi02 { get; set; }
-
         public CategoriesList<AssessmentSectionCategory> CalculateAssessmentSectionCategoryLimitsWbi21(AssessmentSection section)
         {
             ThrowException();
@@ -129,7 +124,7 @@
 
             Calculated = true;
 
-            return FailureMechanismSectionCategoriesOutputWbi01;
+            return FailureMechanismSectionCategoriesOutput;
         }
 
         public CategoriesList<FmSectionCategory> CalculateFmSectionCategoryLimitsWbi02(double assessmentSectionNorm, FailureMechanism failureMechanism)
@@ -142,7 +137,7 @@
 
             Calculated = true;
 
-            return FailureMechanismSectionCategoriesOutputWbi02;
+            return FailureMechanismSectionCategoriesOutput;
         }
 
         private void ThrowException()