Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
@@ -0,0 +1,84 @@
+using Assembly.Kernel.Model.CategoryLimits;
+using NUnit.Framework;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test
+{
+    [TestFixture]
+    public class CategoriesListTestFactoryTest
+    {
+        [Test]
+        public void CreateFailureMechanismSectionCategories_Always_ReturnsValidCategoriesList()
+        {
+            // Call
+            CategoriesList<FmSectionCategory> categories = CategoriesListTestFactory.CreateFailureMechanismSectionCategories();
+
+            // Assert
+            Assert.IsNotNull(categories);
+
+            FmSectionCategory[] sectionCategories = categories.Categories;
+            Assert.AreEqual(4, sectionCategories);
+
+            Assert.AreEqual(0, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.25, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.25, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.5, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.5, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.75, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.75, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(1, sectionCategories[0].UpperLimit);
+        }
+
+        [Test]
+        public void CreateFailureMechanismCategories_Always_ReturnsValidCategoriesList()
+        {
+            // Call
+            CategoriesList<FailureMechanismCategory> categories = CategoriesListTestFactory.CreateFailureMechanismCategories();
+
+            // Assert
+            Assert.IsNotNull(categories);
+
+            FailureMechanismCategory[] sectionCategories = categories.Categories;
+            Assert.AreEqual(4, sectionCategories);
+
+            Assert.AreEqual(0, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.25, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.25, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.5, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.5, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.75, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.75, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(1, sectionCategories[0].UpperLimit);
+        }
+
+        [Test]
+        public void CreateAssessmentSectionCategories_Always_ReturnsValidCategoriesList()
+        {
+            // Call
+            CategoriesList<AssessmentSectionCategory> categories = CategoriesListTestFactory.CreateAssessmentSectionCategories();
+
+            // Assert
+            Assert.IsNotNull(categories);
+
+            AssessmentSectionCategory[] sectionCategories = categories.Categories;
+            Assert.AreEqual(4, sectionCategories);
+
+            Assert.AreEqual(0, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.25, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.25, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.5, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.5, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(0.75, sectionCategories[0].UpperLimit);
+
+            Assert.AreEqual(0.75, sectionCategories[0].LowerLimit);
+            Assert.AreEqual(1, sectionCategories[0].UpperLimit);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs
===================================================================
diff -u -r72dba5708cc6d66f7d4ad698c0b72ddd2f540154 -r4c78adc6aba8a1a80c45f01515d97c84224ba56d
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 72dba5708cc6d66f7d4ad698c0b72ddd2f540154)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
@@ -45,8 +44,15 @@
             Assert.IsInstanceOf<ICategoryLimitsCalculator>(kernel);
             Assert.AreEqual(0, kernel.LowerLimitNorm);
             Assert.AreEqual(0, kernel.SignalingNorm);
+            Assert.AreEqual(0, kernel.AssessmentSectionNorm);
+            Assert.AreEqual(0, kernel.FailureMechanismContribution);
             Assert.AreEqual(0, kernel.N);
             Assert.IsFalse(kernel.Calculated);
+
+            Assert.IsNull(kernel.AssessmentSectionCategoriesOutput);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi01);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi02);
+            Assert.IsNull(kernel.FailureMechanismCategoriesOutput);
         }
 
         [Test]
@@ -74,11 +80,11 @@
             // Setup
             var kernel = new AssemblyCategoriesKernelStub
             {
-                AssessmentSectionCategoriesOutput = Enumerable.Empty<AssessmentSectionCategoryLimits>()
+                AssessmentSectionCategoriesOutput = CategoriesListTestFactory.CreateAssessmentSectionCategories()
             };
 
             // Call
-            IEnumerable<AssessmentSectionCategoryLimits> output = kernel.CalculateAssessmentSectionCategoryLimitsWbi21(CreateValidAssessmentSection());
+            CategoriesList<AssessmentSectionCategory> output = kernel.CalculateAssessmentSectionCategoryLimitsWbi21(CreateValidAssessmentSection());
 
             // Assert
             Assert.AreSame(kernel.AssessmentSectionCategoriesOutput, output);
@@ -162,11 +168,11 @@
             // Setup
             var kernel = new AssemblyCategoriesKernelStub
             {
-                FailureMechanismCategoriesOutput = Enumerable.Empty<FailureMechanismCategoryLimits>()
+                FailureMechanismCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismCategories()
             };
 
             // Call
-            IEnumerable<FailureMechanismCategoryLimits> output = kernel.CalculateFailureMechanismCategoryLimitsWbi11(
+            CategoriesList<FailureMechanismCategory> output = kernel.CalculateFailureMechanismCategoryLimitsWbi11(
                 CreateValidAssessmentSection(),
                 CreateValidFailureMechanism());
 
@@ -256,16 +262,16 @@
             // Setup
             var kernel = new AssemblyCategoriesKernelStub
             {
-                FailureMechanismSectionCategoriesOutput = Enumerable.Empty<FmSectionCategoryLimits>()
+                FailureMechanismSectionCategoriesOutputWbi01 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories()
             };
 
             // Call
-            IEnumerable<FmSectionCategoryLimits> output = kernel.CalculateFmSectionCategoryLimitsWbi01(
+            CategoriesList<FmSectionCategory> output = kernel.CalculateFmSectionCategoryLimitsWbi01(
                 CreateValidAssessmentSection(),
                 CreateValidFailureMechanism());
 
             // Assert
-            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutput, output);
+            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutputWbi01, output);
         }
 
         [Test]
@@ -290,7 +296,7 @@
             Assert.AreEqual("Message", exception.Message);
             Assert.IsNotNull(exception.InnerException);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi01);
         }
 
         [Test]
@@ -316,14 +322,15 @@
             Assert.AreEqual("entity", errorMessage.EntityId);
             Assert.AreEqual(EAssemblyErrors.CategoryLowerLimitOutOfRange, errorMessage.ErrorCode);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi01);
         }
 
         [Test]
         public void CalculateFmSectionCategoryLimitsWbi02_KernelDoesNotThrowException_InputCorrectlySetToKernelAndCalculatedTrue()
         {
             // Setup
-            AssessmentSection assessmentSection = CreateValidAssessmentSection();
+            var random = new Random(21);
+            double assessmentSectionNorm = random.NextDouble();
             FailureMechanism failureMechanism = CreateValidFailureMechanism();
 
             var kernel = new AssemblyCategoriesKernelStub();
@@ -332,14 +339,13 @@
             Assert.IsFalse(kernel.Calculated);
 
             // Call
-            kernel.CalculateFmSectionCategoryLimitsWbi02(assessmentSection,
+            kernel.CalculateFmSectionCategoryLimitsWbi02(assessmentSectionNorm,
                                                          failureMechanism);
 
             // Assert
             Assert.IsTrue(kernel.Calculated);
 
-            Assert.AreEqual(assessmentSection.FailureProbabilitySignallingLimit, kernel.SignalingNorm);
-            Assert.AreEqual(assessmentSection.FailureProbabilityLowerLimit, kernel.LowerLimitNorm);
+            Assert.AreEqual(assessmentSectionNorm, kernel.AssessmentSectionNorm);
             Assert.AreEqual(failureMechanism.FailureProbabilityMarginFactor, kernel.FailureMechanismContribution);
             Assert.AreEqual(failureMechanism.LengthEffectFactor, kernel.N);
         }
@@ -348,24 +354,26 @@
         public void CalculateFmSectionCategoryLimitsWbi02_KernelDoesNotThrowException_ReturnAssessmentSectionCategories()
         {
             // Setup
+            var random = new Random(21);
             var kernel = new AssemblyCategoriesKernelStub
             {
-                FailureMechanismSectionCategoriesOutput = Enumerable.Empty<FmSectionCategoryLimits>()
+                FailureMechanismSectionCategoriesOutputWbi02 = CategoriesListTestFactory.CreateFailureMechanismSectionCategories()
             };
 
             // Call
-            IEnumerable<FmSectionCategoryLimits> output = kernel.CalculateFmSectionCategoryLimitsWbi02(
-                CreateValidAssessmentSection(),
+            CategoriesList<FmSectionCategory> output = kernel.CalculateFmSectionCategoryLimitsWbi02(
+                random.NextDouble(),
                 CreateValidFailureMechanism());
 
             // Assert
-            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutput, output);
+            Assert.AreSame(kernel.FailureMechanismSectionCategoriesOutputWbi02, output);
         }
 
         [Test]
         public void CalculateFmSectionCategoryLimitsWbi02_ThrowExceptionOnCalculateTrue_ThrowsException()
         {
             // Setup
+            var random = new Random(21);
             var kernel = new AssemblyCategoriesKernelStub
             {
                 ThrowExceptionOnCalculate = true
@@ -376,21 +384,22 @@
 
             // Call
             TestDelegate test = () => kernel.CalculateFmSectionCategoryLimitsWbi02(
-                CreateValidAssessmentSection(),
+                random.NextDouble(),
                 CreateValidFailureMechanism());
 
             // Assert
             var exception = Assert.Throws<Exception>(test);
             Assert.AreEqual("Message", exception.Message);
             Assert.IsNotNull(exception.InnerException);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi02);
         }
 
         [Test]
         public void CalculateFmSectionCategoryLimitsWbi02_ThrowAssemblyExceptionOnCalculateTrue_ThrowsAssemblyException()
         {
             // Setup
+            var random = new Random(21);
             var kernel = new AssemblyCategoriesKernelStub
             {
                 ThrowAssemblyExceptionOnCalculate = true
@@ -401,7 +410,7 @@
 
             // Call
             TestDelegate test = () => kernel.CalculateFmSectionCategoryLimitsWbi02(
-                CreateValidAssessmentSection(),
+                random.NextDouble(),
                 CreateValidFailureMechanism());
 
             // Assert
@@ -410,7 +419,7 @@
             Assert.AreEqual("entity", errorMessage.EntityId);
             Assert.AreEqual(EAssemblyErrors.CategoryLowerLimitOutOfRange, errorMessage.ErrorCode);
             Assert.IsFalse(kernel.Calculated);
-            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutput);
+            Assert.IsNull(kernel.FailureMechanismSectionCategoriesOutputWbi02);
         }
 
         private static FailureMechanism CreateValidFailureMechanism()
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj
===================================================================
diff -u -r70196989bbf45e88c19faa7300c59f0b43714beb -r4c78adc6aba8a1a80c45f01515d97c84224ba56d
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 70196989bbf45e88c19faa7300c59f0b43714beb)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
@@ -24,6 +24,7 @@
     <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorStubTest.cs" />
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorStubTest.cs" />
     <Compile Include="Calculators\TestAssemblyToolCalculatorFactoryTest.cs" />
+    <Compile Include="CategoriesListTestFactoryTest.cs" />
     <Compile Include="Kernels\Assembly\AssessmentSectionAssemblyKernelStubTest.cs" />
     <Compile Include="Kernels\Assembly\CombinedFailureMechanismSectionAssemblyKernelStubTest.cs" />
     <Compile Include="Kernels\Assembly\FailureMechanismAssemblyKernelStubTest.cs" />
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
@@ -0,0 +1,68 @@
+using System;
+using Assembly.Kernel.Model;
+using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Model.FmSectionTypes;
+using Core.Common.TestUtil;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil
+{
+    /// <summary>
+    /// Class that creates valid instances of <see cref="CategoriesList{TCategory}"/>
+    /// which can be used for testing.
+    /// </summary>
+    public static class CategoriesListTestFactory
+    {
+        private static readonly Random random = new Random(21);
+
+        /// <summary>
+        /// Creates a valid instance of <see cref="CategoriesList{TCategory}"/>
+        /// containing <see cref="FmSectionCategory"/>.
+        /// </summary>
+        /// <returns>An instance of <see cref="CategoriesList{TCategory}"/>
+        /// containing <see cref="FmSectionCategory"/>.</returns>
+        public static CategoriesList<FmSectionCategory> CreateFailureMechanismSectionCategories()
+        {
+            return new CategoriesList<FmSectionCategory>(new []
+            {
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0, 0.25),
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0.25, 0.5),
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0.5, 0.75),
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0.75, 1.0)
+            });
+        }
+
+        /// <summary>
+        /// Creates a valid instance of <see cref="CategoriesList{TCategory}"/>
+        /// containing <see cref="FailureMechanismCategory"/>.
+        /// </summary>
+        /// <returns>An instance of <see cref="CategoriesList{TCategory}"/>
+        /// containing <see cref="FailureMechanismCategory"/>.</returns>
+        public static CategoriesList<FailureMechanismCategory> CreateFailureMechanismCategories()
+        {
+            return new CategoriesList<FailureMechanismCategory>(new[]
+            {
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0, 0.25),
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0.25, 0.5),
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0.5, 0.75),
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0.75, 1.0)
+            });
+        }
+
+        /// <summary>
+        /// Creates a valid instance of <see cref="CategoriesList{TCategory}"/>
+        /// containing <see cref="AssessmentSectionCategory"/>.
+        /// </summary>
+        /// <returns>An instance of <see cref="CategoriesList{TCategory}"/>
+        /// containing <see cref="AssessmentSectionCategory"/>.</returns>
+        public static CategoriesList<AssessmentSectionCategory> CreateAssessmentSectionCategories()
+        {
+            return new CategoriesList<AssessmentSectionCategory>(new[]
+            {
+                new AssessmentSectionCategory(random.NextEnumValue<EAssessmentGrade>(), 0, 0.25),
+                new AssessmentSectionCategory(random.NextEnumValue<EAssessmentGrade>(), 0.25, 0.5),
+                new AssessmentSectionCategory(random.NextEnumValue<EAssessmentGrade>(), 0.5, 0.75),
+                new AssessmentSectionCategory(random.NextEnumValue<EAssessmentGrade>(), 0.75, 1.0)
+            });
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs
===================================================================
diff -u -r61e0b1bf1351eabb70eccd3fafeb61ade378f44c -r4c78adc6aba8a1a80c45f01515d97c84224ba56d
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision 61e0b1bf1351eabb70eccd3fafeb61ade378f44c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
 using Assembly.Kernel.Model;
@@ -39,6 +38,11 @@
         public bool Calculated { get; private set; }
 
         /// <summary>
+        /// Gets the assessment section norm.
+        /// </summary>
+        public double AssessmentSectionNorm { get; private set; }
+
+        /// <summary>
         /// Gets the lower limit norm.
         /// </summary>
         public double LowerLimitNorm { get; private set; }
@@ -71,19 +75,24 @@
         /// <summary>
         /// Gets or sets the assessment section categories output.
         /// </summary>
-        public IEnumerable<AssessmentSectionCategoryLimits> AssessmentSectionCategoriesOutput { get; set; }
+        public CategoriesList<AssessmentSectionCategory> AssessmentSectionCategoriesOutput { get; set; }
 
         /// <summary>
         /// Gets or sets the failure mechanism categories output.
         /// </summary>
-        public IEnumerable<FailureMechanismCategoryLimits> FailureMechanismCategoriesOutput { get; set; }
+        public CategoriesList<FailureMechanismCategory> FailureMechanismCategoriesOutput { get; set; }
 
         /// <summary>
-        /// Gets or sets the failure mechanism section categories output.
+        /// Gets or sets the failure mechanism section categories output for WBI-01.
         /// </summary>
-        public IEnumerable<FmSectionCategoryLimits> FailureMechanismSectionCategoriesOutput { get; set; }
+        public CategoriesList<FmSectionCategory> FailureMechanismSectionCategoriesOutputWbi01 { get; set; }
 
-        public IEnumerable<AssessmentSectionCategoryLimits> CalculateAssessmentSectionCategoryLimitsWbi21(AssessmentSection section)
+        /// <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();
 
@@ -95,7 +104,7 @@
             return AssessmentSectionCategoriesOutput;
         }
 
-        public IEnumerable<FailureMechanismCategoryLimits> CalculateFailureMechanismCategoryLimitsWbi11(AssessmentSection section, FailureMechanism failureMechanism)
+        public CategoriesList<FailureMechanismCategory> CalculateFailureMechanismCategoryLimitsWbi11(AssessmentSection section, FailureMechanism failureMechanism)
         {
             ThrowException();
 
@@ -109,7 +118,7 @@
             return FailureMechanismCategoriesOutput;
         }
 
-        public IEnumerable<FmSectionCategoryLimits> CalculateFmSectionCategoryLimitsWbi01(AssessmentSection section, FailureMechanism failureMechanism)
+        public CategoriesList<FmSectionCategory> CalculateFmSectionCategoryLimitsWbi01(AssessmentSection section, FailureMechanism failureMechanism)
         {
             ThrowException();
 
@@ -120,21 +129,20 @@
 
             Calculated = true;
 
-            return FailureMechanismSectionCategoriesOutput;
+            return FailureMechanismSectionCategoriesOutputWbi01;
         }
 
-        public IEnumerable<FmSectionCategoryLimits> CalculateFmSectionCategoryLimitsWbi02(AssessmentSection section, FailureMechanism failureMechanism)
+        public CategoriesList<FmSectionCategory> CalculateFmSectionCategoryLimitsWbi02(double assessmentSectionNorm, FailureMechanism failureMechanism)
         {
             ThrowException();
 
-            SignalingNorm = section.FailureProbabilitySignallingLimit;
-            LowerLimitNorm = section.FailureProbabilityLowerLimit;
+            AssessmentSectionNorm = assessmentSectionNorm;
             FailureMechanismContribution = failureMechanism.FailureProbabilityMarginFactor;
             N = failureMechanism.LengthEffectFactor;
 
             Calculated = true;
 
-            return FailureMechanismSectionCategoriesOutput;
+            return FailureMechanismSectionCategoriesOutputWbi02;
         }
 
         private void ThrowException()
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -ra76570f47dca0e8a8eb8a3792f44c82a55dcc5ac -r4c78adc6aba8a1a80c45f01515d97c84224ba56d
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision a76570f47dca0e8a8eb8a3792f44c82a55dcc5ac)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d)
@@ -25,6 +25,7 @@
     <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorStub.cs" />
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorStub.cs" />
     <Compile Include="Calculators\TestAssemblyToolCalculatorFactory.cs" />
+    <Compile Include="CategoriesListTestFactory.cs" />
     <Compile Include="CombinedFailureMechanismSectionAssemblyAssert.cs" />
     <Compile Include="CombinedFailureMechanismSectionsInputAssert.cs" />
     <Compile Include="Kernels\AssemblyToolKernelFactoryConfig.cs" />
@@ -43,6 +44,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Primitives\Ringtoets.Common.Primitives.csproj">
       <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
       <Name>Ringtoets.Common.Primitives</Name>