Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r08b071da0de64c687f3f5c15b58cda89156f431a -r34db16dffea0a12211fe7b576752168a809c03bf
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 08b071da0de64c687f3f5c15b58cda89156f431a)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 34db16dffea0a12211fe7b576752168a809c03bf)
@@ -143,7 +143,7 @@
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
                 CategoriesList<InterpretationCategory> categoryLimits = CreateCategoryLimits();
-                categoryLimitsKernel.CategoryLimits = categoryLimits;
+                categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResult = new KernelFailureMechanismSectionAssemblyResult(
@@ -178,7 +178,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
-                categoryLimitsKernel.CategoryLimits = CreateCategoryLimits();
+                categoryLimitsKernel.InterpretationCategoryLimits = CreateCategoryLimits();
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 var kernelResult = new KernelFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()),
@@ -213,7 +213,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
-                categoryLimitsKernel.CategoryLimits = CreateCategoryLimits();
+                categoryLimitsKernel.InterpretationCategoryLimits = CreateCategoryLimits();
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 var kernelResult = new KernelFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()),
@@ -363,7 +363,7 @@
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
                 CategoriesList<InterpretationCategory> categoryLimits = CreateCategoryLimits();
-                categoryLimitsKernel.CategoryLimits = categoryLimits;
+                categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 failureMechanismSectionAssemblyKernel.FailureMechanismSectionAssemblyResult = new KernelFailureMechanismSectionAssemblyResult(
@@ -400,7 +400,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
-                categoryLimitsKernel.CategoryLimits = CreateCategoryLimits();
+                categoryLimitsKernel.InterpretationCategoryLimits = CreateCategoryLimits();
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 var kernelResult = new KernelFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()),
@@ -435,7 +435,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
-                categoryLimitsKernel.CategoryLimits = CreateCategoryLimits();
+                categoryLimitsKernel.InterpretationCategoryLimits = CreateCategoryLimits();
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
                 var kernelResult = new KernelFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()),
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyGroupBoundariesCalculatorTest.cs
===================================================================
diff -u -r0dd845e24345d1aabe638c847f5244f352e8585b -r34db16dffea0a12211fe7b576752168a809c03bf
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyGroupBoundariesCalculatorTest.cs	(.../AssemblyGroupBoundariesCalculatorTest.cs)	(revision 0dd845e24345d1aabe638c847f5244f352e8585b)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyGroupBoundariesCalculatorTest.cs	(.../AssemblyGroupBoundariesCalculatorTest.cs)	(revision 34db16dffea0a12211fe7b576752168a809c03bf)
@@ -80,7 +80,7 @@
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
                 CategoriesList<InterpretationCategory> categoryLimits = CreateCategoryLimits();
-                categoryLimitsKernel.CategoryLimits = categoryLimits;
+                categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
                 var calculator = new AssemblyGroupBoundariesCalculator(factory);
 
@@ -106,7 +106,7 @@
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
                 CategoriesList<InterpretationCategory> categoryLimits = CreateCategoryLimits();
-                categoryLimitsKernel.CategoryLimits = categoryLimits;
+                categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
                 var calculator = new AssemblyGroupBoundariesCalculator(factory);
 
@@ -136,7 +136,7 @@
                 {
                     new InterpretationCategory((EInterpretationCategory) 99, new Probability(0), new Probability(1))
                 });
-                categoryLimitsKernel.CategoryLimits = categoryLimits;
+                categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
                 var calculator = new AssemblyGroupBoundariesCalculator(factory);
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoryLimitsKernelStub.cs
===================================================================
diff -u -r0dd845e24345d1aabe638c847f5244f352e8585b -r34db16dffea0a12211fe7b576752168a809c03bf
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoryLimitsKernelStub.cs	(.../AssemblyCategoryLimitsKernelStub.cs)	(revision 0dd845e24345d1aabe638c847f5244f352e8585b)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoryLimitsKernelStub.cs	(.../AssemblyCategoryLimitsKernelStub.cs)	(revision 34db16dffea0a12211fe7b576752168a809c03bf)
@@ -45,9 +45,14 @@
         /// <summary>
         /// Sets the <see cref="CategoriesList{TCategory}"/> assembly result.
         /// </summary>
-        public CategoriesList<InterpretationCategory> CategoryLimits { private get; set; }
+        public CategoriesList<InterpretationCategory> InterpretationCategoryLimits { private get; set; }
 
         /// <summary>
+        /// Sets the <see cref="CategoriesList{TCategory}"/> assembly result.
+        /// </summary>
+        public CategoriesList<AssessmentSectionCategory> AssessmentSectionCategoryLimits { private get; set; }
+
+        /// <summary>
         /// Sets an indicator whether an <see cref="Exception"/> must be thrown while performing a calculation.
         /// </summary>
         public bool ThrowExceptionOnCalculate { private get; set; }
@@ -59,7 +64,12 @@
 
         public CategoriesList<AssessmentSectionCategory> CalculateAssessmentSectionCategoryLimitsWbi21(AssessmentSection section)
         {
-            throw new NotImplementedException();
+            ThrowException();
+
+            Calculated = true;
+            AssessmentSection = section;
+
+            return AssessmentSectionCategoryLimits;
         }
 
         public CategoriesList<InterpretationCategory> CalculateInterpretationCategoryLimitsWbi03(AssessmentSection section)
@@ -69,7 +79,7 @@
             Calculated = true;
             AssessmentSection = section;
 
-            return CategoryLimits;
+            return InterpretationCategoryLimits;
         }
 
         private void ThrowException()