Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r08b071da0de64c687f3f5c15b58cda89156f431a -r49ca7454363e3b5a67cc262db79914c567efa20a
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 08b071da0de64c687f3f5c15b58cda89156f431a)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 49ca7454363e3b5a67cc262db79914c567efa20a)
@@ -43,7 +43,7 @@
         /// Creates a new instance of <see cref="FailureMechanismAssemblyCalculator"/>.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any <paramref name="factory"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
         public FailureMechanismAssemblyCalculator(IAssemblyToolKernelFactory factory)
         {
             if (factory == null)
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj
===================================================================
diff -u -rcfe29ef6d89e6af74ca09701d5e471a54e984a86 -r49ca7454363e3b5a67cc262db79914c567efa20a
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.csproj)	(revision cfe29ef6d89e6af74ca09701d5e471a54e984a86)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.csproj)	(revision 49ca7454363e3b5a67cc262db79914c567efa20a)
@@ -25,8 +25,6 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
-        <Compile Remove="Calculators\Categories\IAssemblyCategoriesCalculatorOld.cs" />
-        <Compile Remove="Calculators\Categories\AssemblyCategoriesCalculatorOld.cs" />
     </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -r08b071da0de64c687f3f5c15b58cda89156f431a -r49ca7454363e3b5a67cc262db79914c567efa20a
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 08b071da0de64c687f3f5c15b58cda89156f431a)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 49ca7454363e3b5a67cc262db79914c567efa20a)
@@ -173,7 +173,7 @@
 
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(Call);
                 Assert.IsInstanceOf<Exception>(exception.InnerException);
-                Assert.AreEqual(AssemblyErrorMessageCreatorOld.CreateGenericErrorMessage(), exception.Message);
+                Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message);
             }
         }
 
@@ -199,7 +199,7 @@
 
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(Call);
                 Assert.IsInstanceOf<Exception>(exception.InnerException);
-                Assert.AreEqual(AssemblyErrorMessageCreatorOld.CreateGenericErrorMessage(), exception.Message);
+                Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message);
             }
         }
 
Fisheye: Tag 2f660e66788675684eccbdaeeaa7923d332e529e refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 49ca7454363e3b5a67cc262db79914c567efa20a refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailurePathAssemblyKernelStub.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs
===================================================================
diff -u -re3f96d953b0b3e82352b7de282861e22f120c1f5 -r49ca7454363e3b5a67cc262db79914c567efa20a
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs	(.../FailureMechanismAssemblyResultFactory.cs)	(revision e3f96d953b0b3e82352b7de282861e22f120c1f5)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs	(.../FailureMechanismAssemblyResultFactory.cs)	(revision 49ca7454363e3b5a67cc262db79914c567efa20a)
@@ -30,7 +30,7 @@
 namespace Riskeer.Common.Data.AssemblyTool
 {
     /// <summary>
-    /// Factory for creating assembly results of a failure mechanism.
+    /// Factory for calculating assembly results of a failure mechanism.
     /// </summary>
     public static class FailureMechanismAssemblyResultFactory
     {
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs
===================================================================
diff -u -re3f96d953b0b3e82352b7de282861e22f120c1f5 -r49ca7454363e3b5a67cc262db79914c567efa20a
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs	(.../FailureMechanismAssemblyResultFactoryTest.cs)	(revision e3f96d953b0b3e82352b7de282861e22f120c1f5)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs	(.../FailureMechanismAssemblyResultFactoryTest.cs)	(revision 49ca7454363e3b5a67cc262db79914c567efa20a)
@@ -73,17 +73,21 @@
         public void AssembleFailureMechanism_CalculatorRan_ReturnsOutput()
         {
             // Setup
+            var random = new Random(21);
+            double expectedAssemblyResult = random.NextDouble();
+
             using (new AssemblyToolCalculatorFactoryConfig())
             {
+                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
+                FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
+                calculator.AssemblyResult = expectedAssemblyResult;
+
                 // Call
                 double assemblyResult = FailureMechanismAssemblyResultFactory.AssembleFailureMechanism(
                     0, Enumerable.Empty<FailureMechanismSectionAssemblyResult>());
 
                 // Assert
-                var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                FailureMechanismAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
-
-                Assert.AreEqual(calculator.AssemblyResult, assemblyResult);
+                Assert.AreEqual(expectedAssemblyResult, assemblyResult);
             }
         }