Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -299,7 +299,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
             }
 
             try
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs	(.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs	(.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -1016,7 +1016,7 @@
                 new Random(39).NextBoolean());
 
             // Assert
-            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
+            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly(), assembly);
             mocks.VerifyAll();
         }
 
Fisheye: Tag c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactoryOId.cs
===================================================================
diff -u
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactoryOId.cs	(revision 0)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismAssemblyResultFactoryOId.cs	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Riskeer.AssemblyTool.Data;
+
+namespace Riskeer.Common.Data.AssemblyTool
+{
+    /// <summary>
+    /// Factory for creating results of a failure mechanism assembly.
+    /// </summary>
+    public static class FailureMechanismAssemblyResultFactoryOld
+    {
+        /// <summary>
+        /// Creates an instance of <see cref="FailureMechanismAssembly"/> which
+        /// represents a not applicable result.
+        /// </summary>
+        public static FailureMechanismAssembly CreateNotApplicableAssembly()
+        {
+            return new FailureMechanismAssembly(double.NaN, FailureMechanismAssemblyCategoryGroup.NotApplicable);
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="FailureMechanismAssemblyCategoryGroup"/> which
+        /// represents a not applicable result.
+        /// </summary>
+        public static FailureMechanismAssemblyCategoryGroup CreateNotApplicableCategory()
+        {
+            return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryOldTest.cs
===================================================================
diff -u
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryOldTest.cs	(revision 0)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryOldTest.cs	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.Common.Data.AssemblyTool;
+
+namespace Riskeer.Common.Data.Test.AssemblyTool
+{
+    [TestFixture]
+    public class FailureMechanismAssemblyResultFactoryOldTest
+    {
+        [Test]
+        public void CreateNotApplicableAssembly_Always_ReturnsExpectedFailureMechanismAssembly()
+        {
+            // Call
+            FailureMechanismAssembly assembly = FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
+
+            // Assert
+            Assert.IsNaN(assembly.Probability);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, assembly.Group);
+        }
+
+        [Test]
+        public void CreateNotApplicableCategory_Always_ReturnsExpectedFailureMechanismAssembly()
+        {
+            // Call
+            FailureMechanismAssemblyCategoryGroup category = FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
+
+            // Assert
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, category);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismAssemblyResultFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -222,7 +222,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -569,7 +569,7 @@
             FailureMechanismAssemblyCategoryGroup category = DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -297,7 +297,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
             }
 
             try
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -956,7 +956,7 @@
                 new Random(39).NextBoolean());
 
             // Assert
-            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
+            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly(), assembly);
             mocks.VerifyAll();
         }
 
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -224,7 +224,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -572,7 +572,7 @@
             FailureMechanismAssemblyCategoryGroup category = GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -299,7 +299,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
             }
 
             try
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -1016,7 +1016,7 @@
                 new Random(39).NextBoolean());
 
             // Assert
-            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
+            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly(), assembly);
             mocks.VerifyAll();
         }
 
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -230,7 +230,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -230,7 +230,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -230,7 +230,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -230,7 +230,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -196,7 +196,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -578,7 +578,7 @@
             FailureMechanismAssemblyCategoryGroup category = GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -578,7 +578,7 @@
             FailureMechanismAssemblyCategoryGroup category = GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -578,7 +578,7 @@
             FailureMechanismAssemblyCategoryGroup category = MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -578,7 +578,7 @@
             FailureMechanismAssemblyCategoryGroup category = PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -501,7 +501,7 @@
             FailureMechanismAssemblyCategoryGroup category = WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -301,7 +301,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
             }
 
             try
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -1080,7 +1080,7 @@
                 new Random(39).NextBoolean());
 
             // Assert
-            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
+            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly(), assembly);
             mocks.VerifyAll();
         }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -302,7 +302,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
             }
 
             try
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -1084,7 +1084,7 @@
                 new Random(39).NextBoolean());
 
             // Assert
-            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
+            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly(), assembly);
             mocks.VerifyAll();
         }
 
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -298,7 +298,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly();
             }
 
             try
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -1015,7 +1015,7 @@
                 new Random(39).NextBoolean());
 
             // Assert
-            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
+            AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableAssembly(), assembly);
             mocks.VerifyAll();
         }
 
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -223,7 +223,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -569,7 +569,7 @@
             FailureMechanismAssemblyCategoryGroup category = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -224,7 +224,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
+                return FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory();
             }
 
             try
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rc1ab7a1a90017e3f3680b0536fb85ddc44f5ae66
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision c1ab7a1a90017e3f3680b0536fb85ddc44f5ae66)
@@ -572,7 +572,7 @@
             FailureMechanismAssemblyCategoryGroup category = WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, new Random(39).NextBoolean());
 
             // Assert
-            Assert.AreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory(), category);
+            Assert.AreEqual(FailureMechanismAssemblyResultFactoryOld.CreateNotApplicableCategory(), category);
         }
 
         [Test]