Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -radc7ea257dbb54e7beea7b39e78687f09c65fb01 -r9cb9df81153f33c4a236447dc3daf0c65c4a45a3
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs	(.../IFailureMechanismAssemblyCalculator.cs)	(revision adc7ea257dbb54e7beea7b39e78687f09c65fb01)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs	(.../IFailureMechanismAssemblyCalculator.cs)	(revision 9cb9df81153f33c4a236447dc3daf0c65c4a45a3)
@@ -33,7 +33,7 @@
         /// Assembles the failure mechanism using the given <paramref name="sectionCategories"/>.
         /// </summary>
         /// <param name="sectionCategories">The collection of <see cref="FailureMechanismSectionAssemblyCategoryGroup"/> to assemble for.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="FailureMechanismAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
         FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories);
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs
===================================================================
diff -u -r2903f7033d125ab724acc44f5d40610bc3f88765 -r9cb9df81153f33c4a236447dc3daf0c65c4a45a3
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs	(.../FailureMechanismAssemblyCreator.cs)	(revision 2903f7033d125ab724acc44f5d40610bc3f88765)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs	(.../FailureMechanismAssemblyCreator.cs)	(revision 9cb9df81153f33c4a236447dc3daf0c65c4a45a3)
@@ -22,7 +22,6 @@
 using System;
 using System.ComponentModel;
 using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FmSectionTypes;
 using Ringtoets.AssemblyTool.Data;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.Creators
@@ -34,7 +33,7 @@
     internal static class FailureMechanismAssemblyCreator
     {
         /// <summary>
-        /// Creates <see cref="FailureMechanismAssembly"/> from the given <see cref="FmSectionAssemblyDirectResult"/>.
+        /// Creates <see cref="FailureMechanismAssembly"/> from the given <see cref="FailureMechanismAssemblyResult"/>.
         /// </summary>
         /// <param name="result">The result to create the assembly from.</param>
         /// <returns>The created assembly.</returns>
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -radc7ea257dbb54e7beea7b39e78687f09c65fb01 -r9cb9df81153f33c4a236447dc3daf0c65c4a45a3
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision adc7ea257dbb54e7beea7b39e78687f09c65fb01)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 9cb9df81153f33c4a236447dc3daf0c65c4a45a3)
@@ -32,7 +32,6 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Creators;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
-using Ringtoets.AssemblyTool.KernelWrapper.Test.Creators;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 
@@ -80,7 +79,7 @@
                 // Call
                 TestDelegate test = () => calculator.AssembleFailureMechanism(new[]
                 {
-                   (FailureMechanismSectionAssemblyCategoryGroup) 99
+                    (FailureMechanismSectionAssemblyCategoryGroup) 99
                 });
 
                 // Assert
@@ -96,9 +95,9 @@
         {
             // Setup
             var random = new Random(39);
-            var categoryGroups = new []
+            var categoryGroups = new[]
             {
-               random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()
+                random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>()
             };
 
             using (new AssemblyToolKernelFactoryConfig())
@@ -113,7 +112,7 @@
                 calculator.AssembleFailureMechanism(categoryGroups);
 
                 // Assert
-                Assert.AreEqual(categoryGroups.Single(), 
+                Assert.AreEqual(categoryGroups.Single(),
                                 FailureMechanismSectionAssemblyCreator.CreateFailureMechanismSectionAssemblyCategoryGroup(
                                     kernel.FmSectionAssemblyResultsInput.Single().Result));
                 Assert.IsFalse(kernel.PartialAssembly);
@@ -243,14 +242,6 @@
             }
         }
 
-        private static void AssertCalculatorOutput(FailureMechanismSectionAssembly expectedSectionAssembly,
-                                                   FmSectionAssemblyDirectResult actualResult)
-        {
-            Assert.AreEqual(expectedSectionAssembly.Group, 
-                            FailureMechanismSectionAssemblyCreator.CreateFailureMechanismSectionAssemblyCategoryGroup(actualResult.Result));
-            Assert.AreEqual(expectedSectionAssembly.Probability, actualResult.FailureProbability);
-        }
-
         [Test]
         public void AssembleFailureMechanismWithProbabilities_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator()
         {
@@ -273,7 +264,6 @@
                 Assert.AreEqual(FailureMechanismAssemblyCreator.CreateFailureMechanismAssemblyCategoryGroup(kernel.FailureMechanismAssemblyResult.Category),
                                 assembly.Group);
                 Assert.AreEqual(kernel.FailureMechanismAssemblyResult.FailureProbability, assembly.Probability);
-
             }
         }
 
@@ -325,6 +315,14 @@
             }
         }
 
+        private static void AssertCalculatorOutput(FailureMechanismSectionAssembly expectedSectionAssembly,
+                                                   FmSectionAssemblyDirectResult actualResult)
+        {
+            Assert.AreEqual(expectedSectionAssembly.Group,
+                            FailureMechanismSectionAssemblyCreator.CreateFailureMechanismSectionAssemblyCategoryGroup(actualResult.Result));
+            Assert.AreEqual(expectedSectionAssembly.Probability, actualResult.FailureProbability);
+        }
+
         private AssemblyCategoriesInput CreateAssemblyCategoriesInput()
         {
             var random = new Random(39);