Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -488,7 +488,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -551,7 +551,7 @@
 
             // Call
             TestDelegate call = () => GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(sectionResult,
-                                                                                                                              new Random(39).NextBoolean());
+                                                                                                                              true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -638,7 +638,8 @@
                 GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), 
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -488,7 +488,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -551,7 +551,7 @@
 
             // Call
             TestDelegate call = () => GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(sectionResult,
-                                                                                                                               new Random(39).NextBoolean());
+                                                                                                                               true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -638,7 +638,8 @@
                 GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), 
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r16d1086cd46db3f46db696a0a361becddfe58679 -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 16d1086cd46db3f46db696a0a361becddfe58679)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -809,7 +809,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
             mocks.VerifyAll();
         }
 
@@ -901,7 +901,7 @@
                 sectionResult,
                 failureMechanism,
                 assessmentSection,
-                new Random(39).NextBoolean());
+                true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -1035,7 +1035,8 @@
                                                                                                true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), 
+                                calculator.FailureMechanismSectionCategories.Single());
             }
 
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -488,7 +488,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -551,7 +551,7 @@
 
             // Call
             TestDelegate call = () => MicrostabilityFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(sectionResult,
-                                                                                                                    new Random(39).NextBoolean());
+                                                                                                                    true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -638,7 +638,8 @@
                 MicrostabilityFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), 
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismAssemblyFactoryTest.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -488,7 +488,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -551,7 +551,7 @@
 
             // Call
             TestDelegate call = () => PipingStructureFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(sectionResult,
-                                                                                                                     new Random(39).NextBoolean());
+                                                                                                                     true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -638,7 +638,8 @@
                 PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r8081c81f8eb0dad598381b1dbe910e6f060287a3 -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs)	(revision 8081c81f8eb0dad598381b1dbe910e6f060287a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -406,7 +406,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -470,7 +470,7 @@
             // Call
             TestDelegate call = () => StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(
                 sectionResult,
-                new Random(39).NextBoolean());
+                true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -557,7 +557,8 @@
                 StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r8081c81f8eb0dad598381b1dbe910e6f060287a3 -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs)	(revision 8081c81f8eb0dad598381b1dbe910e6f060287a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -406,7 +406,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -469,7 +469,7 @@
 
             // Call
             TestDelegate call = () => TechnicalInnovationFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(sectionResult,
-                                                                                                                         new Random(39).NextBoolean());
+                                                                                                                         true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -556,7 +556,8 @@
                 TechnicalInnovationFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r8081c81f8eb0dad598381b1dbe910e6f060287a3 -re18bff5ec38e3850494e43faec3b9272a39e82f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision 8081c81f8eb0dad598381b1dbe910e6f060287a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision e18bff5ec38e3850494e43faec3b9272a39e82f3)
@@ -406,7 +406,7 @@
                 true);
 
             // Assert
-            Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, categoryGroup);
+            Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), categoryGroup);
         }
 
         [Test]
@@ -469,7 +469,7 @@
 
             // Call
             TestDelegate call = () => WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(sectionResult,
-                                                                                                                               new Random(39).NextBoolean());
+                                                                                                                               true);
 
             // Assert
             var exception = Assert.Throws<AssemblyException>(call);
@@ -556,7 +556,8 @@
                 WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, true);
 
                 // Assert
-                Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single());
+                Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+                                calculator.FailureMechanismSectionCategories.Single());
             }
         }