Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs
===================================================================
diff -u -ra85d210a9773419f6038ad8221e14c66e098c97a -rc0263fd00d9cc433209bbc0f4f68798bfd845bae
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs	(.../AssemblyCategoriesInput.cs)	(revision a85d210a9773419f6038ad8221e14c66e098c97a)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs	(.../AssemblyCategoriesInput.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
@@ -29,7 +29,8 @@
         /// <summary>
         /// Creates a new instance of <see cref="AssemblyCategoriesInput"/>.
         /// </summary>
-        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
+        /// <param name="n">The 'N' parameter of the failure mechanism
+        /// used to factor in the 'length effect'.</param>
         /// <param name="failureMechanismContribution">The contribution of a failure mechanism.</param>
         /// <param name="signalingNorm">The signaling norm of the assessment section.</param>
         /// <param name="lowerLimitNorm">The lower limit norm of the assessment section.</param>
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -rbaf9e7a385fd374010f076868ddccc77b4da17ce -rc0263fd00d9cc433209bbc0f4f68798bfd845bae
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs	(.../IFailureMechanismSectionAssemblyCalculator.cs)	(revision baf9e7a385fd374010f076868ddccc77b4da17ce)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs	(.../IFailureMechanismSectionAssemblyCalculator.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
@@ -81,7 +81,7 @@
         /// </summary>
         /// <param name="detailedAssessmentResult">The <see cref="DetailedAssessmentProbabilityOnlyResultType"/> to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
-        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
+        /// <param name="n">The 'N' parameter of the failure mechanism section used to factor in the 'length effect'.</param>
         /// <param name="assemblyCategoriesInput">The object containing the input parameters for
         /// determining the assembly categories.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
@@ -161,7 +161,7 @@
         /// <param name="tailorMadeAssessmentResult">The <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>
         /// to assemble for.</param>
         /// <param name="probability">The calculated probability.</param>
-        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
+        /// <param name="n">The 'N' parameter of the failure mechanism section used to factor in the 'length effect'.</param>
         /// <param name="assemblyCategoriesInput">The object containing the input parameters for
         /// determining the assembly categories.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u -r846d55260318cd847e6fca9ce9d9b3c057b96f2c -rc0263fd00d9cc433209bbc0f4f68798bfd845bae
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision 846d55260318cd847e6fca9ce9d9b3c057b96f2c)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
@@ -48,7 +48,7 @@
         /// contains an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryLimits"/>
         /// contains a valid value, but unsupported.</exception>
-        public static IEnumerable<AssessmentSectionAssemblyCategory> CreateAssessmentSectionAssemblyCategories(
+        internal static IEnumerable<AssessmentSectionAssemblyCategory> CreateAssessmentSectionAssemblyCategories(
             IEnumerable<AssessmentSectionCategoryLimits> categoryLimits)
         {
             if (categoryLimits == null)
@@ -76,7 +76,7 @@
         /// contains an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryLimits"/>
         /// contains a valid value, but unsupported.</exception>
-        public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
+        internal static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
             IEnumerable<FmSectionCategoryLimits> categoryLimits)
         {
             if (categoryLimits == null)
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u -rbaf9e7a385fd374010f076868ddccc77b4da17ce -rc0263fd00d9cc433209bbc0f4f68798bfd845bae
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision baf9e7a385fd374010f076868ddccc77b4da17ce)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
@@ -56,14 +56,10 @@
 
             var categoryLimits = new[]
             {
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.APlus, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.A, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.B, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.C, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.D, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.Gr, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.Ngo, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new AssessmentSectionCategoryLimits(EAssessmentGrade.Nvt, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1))
+                new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
+                new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
+                new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
+                new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1))
             };
 
             // Call
@@ -96,6 +92,9 @@
         [TestCase(EAssessmentGrade.B, AssessmentSectionAssemblyCategoryGroup.B)]
         [TestCase(EAssessmentGrade.C, AssessmentSectionAssemblyCategoryGroup.C)]
         [TestCase(EAssessmentGrade.D, AssessmentSectionAssemblyCategoryGroup.D)]
+        [TestCase(EAssessmentGrade.Gr, AssessmentSectionAssemblyCategoryGroup.None)]
+        [TestCase(EAssessmentGrade.Nvt, AssessmentSectionAssemblyCategoryGroup.NotApplicable)]
+        [TestCase(EAssessmentGrade.Ngo, AssessmentSectionAssemblyCategoryGroup.NotAssessed)]
         public void CreateAssessmentSectionAssemblyCategories_CategoryWithValidAssessmentGrade_ExpectedAssessmentSectionAssemblyCategoryResultType(
             EAssessmentGrade categoryGroup,
             AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup)
@@ -134,15 +133,10 @@
 
             var categoryLimits = new[]
             {
-                new FmSectionCategoryLimits(EFmSectionCategory.Gr, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.Iv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.IIv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.IIIv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.IVv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.Vv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.VIv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.VIIv, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(EFmSectionCategory.NotApplicable, random.NextDouble(0, 0.5), random.NextDouble(0.5, 1))
+                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
+                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
+                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
+                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1))
             };
 
             // Call
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -r24b82f8153fa940d4ee530031b3486f8b66d4b6e -rc0263fd00d9cc433209bbc0f4f68798bfd845bae
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision 24b82f8153fa940d4ee530031b3486f8b66d4b6e)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
@@ -116,6 +116,44 @@
             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()
         {
@@ -197,39 +235,6 @@
             Assert.AreEqual(expectedResult, result);
         }
 
-        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>());
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>());
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>());
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99,
-                                              random.NextEnumValue<DetailedAssessmentResultType>());
-                yield return new TestCaseData(random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              random.NextEnumValue<DetailedAssessmentResultType>(),
-                                              (DetailedAssessmentResultType) 99);
-            }
-        }
-
         private static ECategoryCompliancy GetCategoryCompliance(DetailedAssessmentResultType detailedAssessmentResult)
         {
             switch (detailedAssessmentResult)
@@ -272,7 +277,7 @@
         [TestCase(FailureMechanismSectionAssemblyCategoryGroup.Vv, EFmSectionCategory.Vv)]
         [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIv, EFmSectionCategory.VIv)]
         [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIIv, EFmSectionCategory.VIIv)]
-        public void CreateFailureMechanismSectionAssemblyDirectResult_WithAssembly_ReturnFailureMechanismSectionDirectAssemblyResult(
+        public void CreateFailureMechanismSectionAssemblyDirectResult_WithAssembly_ReturnFmSectionAssemblyDirectResult(
             FailureMechanismSectionAssemblyCategoryGroup originalGroup,
             EFmSectionCategory expectedGroup)
         {
@@ -311,7 +316,7 @@
         [TestCase(FailureMechanismSectionAssemblyCategoryGroup.Vv, EFmSectionCategory.Vv)]
         [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIv, EFmSectionCategory.VIv)]
         [TestCase(FailureMechanismSectionAssemblyCategoryGroup.VIIv, EFmSectionCategory.VIIv)]
-        public void CreateFailureMechanismSectionAssemblyDirectResult_WithValidGroup_ReturnFmSectionCategory(
+        public void CreateFailureMechanismSectionAssemblyDirectResult_WithValidGroup_ReturnFmSectionAssemblyDirectResult(
             FailureMechanismSectionAssemblyCategoryGroup originalGroup,
             EFmSectionCategory expectedGroup)
         {
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs
===================================================================
diff -u -rb383e70b46497809f46d7b33c4a6d0d3563866e2 -rc0263fd00d9cc433209bbc0f4f68798bfd845bae
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs	(.../FailureMechanismSectionAssemblyKernelStubTest.cs)	(revision b383e70b46497809f46d7b33c4a6d0d3563866e2)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs	(.../FailureMechanismSectionAssemblyKernelStubTest.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
@@ -60,6 +60,18 @@
             Assert.IsNull(kernel.FailureMechanismSectionDirectResult);
         }
 
+        private static FailureMechanism CreateRandomFailureMechanism(Random random)
+        {
+            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            return failureMechanism;
+        }
+
+        private static AssessmentSection CreateRandomAssessmentSection(Random random)
+        {
+            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
+            return assessmentSection;
+        }
+
         #region Simple Assessment
 
         [Test]
@@ -289,8 +301,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeG2>();
             double failureProbability = random.NextDouble();
 
@@ -315,8 +327,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeG2>();
             double failureProbability = random.NextDouble();
 
@@ -340,8 +352,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeG2>();
             double failureProbability = random.NextDouble();
 
@@ -383,8 +395,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeG2>();
             double failureProbability = random.NextDouble();
             double lengthEffect = random.NextDouble();
@@ -411,8 +423,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeG2>();
             double failureProbability = random.NextDouble();
             double lengthEffect = random.NextDouble();
@@ -438,8 +450,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeG2>();
             double failureProbability = random.NextDouble();
             double lengthEffect = random.NextDouble();
@@ -614,8 +626,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT3>();
             double failureProbability = random.NextDouble();
 
@@ -640,8 +652,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT3>();
             double failureProbability = random.NextDouble();
 
@@ -665,8 +677,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT3>();
             double failureProbability = random.NextDouble();
 
@@ -761,8 +773,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT3>();
             double failureProbability = random.NextDouble();
             double lengthEffect = random.NextDouble();
@@ -789,8 +801,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT3>();
             double failureProbability = random.NextDouble();
             double lengthEffect = random.NextDouble();
@@ -816,8 +828,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT3>();
             double failureProbability = random.NextDouble();
             double lengthEffect = random.NextDouble();
@@ -865,8 +877,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT4>();
             double failureProbability = random.NextDouble();
 
@@ -891,8 +903,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT4>();
             double failureProbability = random.NextDouble();
 
@@ -916,8 +928,8 @@
         {
             // Setup
             var random = new Random(39);
-            var assessmentSection = new AssessmentSection(random.NextDouble(), random.NextDouble(0.0, 0.5), random.NextDouble(0.5, 1.0));
-            var failureMechanism = new FailureMechanism(random.NextDouble(1, 5), random.NextDouble());
+            AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
+            FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
             var assessmentResult = random.NextEnumValue<EAssessmentResultTypeT4>();
             double failureProbability = random.NextDouble();