Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rc0263fd00d9cc433209bbc0f4f68798bfd845bae -rb5cd2bc289582dae8bb85a05204eba5ebeeee0f0
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision b5cd2bc289582dae8bb85a05204eba5ebeeee0f0)
@@ -116,44 +116,6 @@
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
-        private static IEnumerable<TestCaseData> InvalidDetailedAssessmentCategoryResults
-        {
-            get
-            {
-                var random = new Random(39);
-                yield return new TestCaseData((DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>())
-                    .SetName($"DetailedAssessmentResultForFactorizedSignalingNorm invalid {nameof(DetailedAssessmentResultType)}");
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>())
-                    .SetName($"DetailedAssessmentResultForSignalingNorm invalid {nameof(DetailedAssessmentResultType)}");
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>())
-                    .SetName($"DetailedAssessmentResultForMechanismSpecificLowerLimitNorm invalid {nameof(DetailedAssessmentResultType)}");
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>())
-                    .SetName($"DetailedAssessmentResultForLowerLimitNorm invalid {nameof(DetailedAssessmentResultType)}");
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99)
-                    .SetName($"DetailedAssessmentResultForFactorizedLowerLimitNorm invalid {nameof(DetailedAssessmentResultType)}");
-            }
-        }
-
         [Test]
         public void CreateCategoryCompliancyResults_ValidInput_ReturnsFmSectionCategoryCompliancyResults()
         {
@@ -252,6 +214,44 @@
             }
         }
 
+        private static IEnumerable<TestCaseData> InvalidDetailedAssessmentCategoryResults
+        {
+            get
+            {
+                var random = new Random(39);
+                yield return new TestCaseData((DetailedAssessmentResultType) 99,
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>())
+                    .SetName($"DetailedAssessmentResultForFactorizedSignalingNorm invalid {nameof(DetailedAssessmentResultType)}");
+                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              (DetailedAssessmentResultType) 99,
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>())
+                    .SetName($"DetailedAssessmentResultForSignalingNorm invalid {nameof(DetailedAssessmentResultType)}");
+                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              (DetailedAssessmentResultType) 99,
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>())
+                    .SetName($"DetailedAssessmentResultForMechanismSpecificLowerLimitNorm invalid {nameof(DetailedAssessmentResultType)}");
+                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              (DetailedAssessmentResultType) 99,
+                                              random.NextEnumValue<DetailedAssessmentResultType>())
+                    .SetName($"DetailedAssessmentResultForLowerLimitNorm invalid {nameof(DetailedAssessmentResultType)}");
+                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              random.NextEnumValue<DetailedAssessmentResultType>(),
+                                              (DetailedAssessmentResultType) 99)
+                    .SetName($"DetailedAssessmentResultForFactorizedLowerLimitNorm invalid {nameof(DetailedAssessmentResultType)}");
+            }
+        }
+
         #endregion
 
         #region Failure Mechanism Section Assembly
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs
===================================================================
diff -u -rd770e9f1f1bb2a8422acd775f573429a0d2b5814 -rb5cd2bc289582dae8bb85a05204eba5ebeeee0f0
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs	(.../AssemblyCategoriesCalculatorStubTest.cs)	(revision d770e9f1f1bb2a8422acd775f573429a0d2b5814)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs	(.../AssemblyCategoriesCalculatorStubTest.cs)	(revision b5cd2bc289582dae8bb85a05204eba5ebeeee0f0)
@@ -168,11 +168,7 @@
         public void CalculateFailureMechanismSectionCategories_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
-            var random = new Random(39);
-            var assemblyCategoriesInput = new AssemblyCategoriesInput(random.NextDouble(1, 5),
-                                                                      random.NextDouble(), 
-                                                                      random.NextDouble(0.0, 0.4), 
-                                                                      random.NextDouble(0.5, 1.0));
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new AssemblyCategoriesCalculatorStub();
 
@@ -238,11 +234,7 @@
         public void CalculateGeotechnicFailureMechanismSectionCategories_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
-            var random = new Random(39);
-            var assemblyCategoriesInput = new AssemblyCategoriesInput(random.NextDouble(1, 5),
-                                                                      random.NextDouble(), 
-                                                                      random.NextDouble(0.0, 0.4), 
-                                                                      random.NextDouble(0.5, 1.0));
+            AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             var calculator = new AssemblyCategoriesCalculatorStub();