Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r4823d81e68837eec1ebb52616ae21982462fe6ab -r58d429ac22e6e6cb36de3b1d3b18c63500675049
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 4823d81e68837eec1ebb52616ae21982462fe6ab)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 58d429ac22e6e6cb36de3b1d3b18c63500675049)
@@ -95,7 +95,7 @@
         }
 
         [Test]
-        public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults()
+        public void Create_SectionResultWithNaNValues_ReturnsEntityWithExpectedResults()
         {
             // Setup
             var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rddb88b5bdd3b694ca96197e3b277c8096ce91cb9 -r58d429ac22e6e6cb36de3b1d3b18c63500675049
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision ddb88b5bdd3b694ca96197e3b277c8096ce91cb9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 58d429ac22e6e6cb36de3b1d3b18c63500675049)
@@ -68,17 +68,17 @@
             var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
             double tailorMadeAssessmentProbability = random.NextDouble();
-            bool useManualAssessmentProbability = random.NextBoolean();
-            double manualAssessmentProbability = random.NextDouble();
+            bool useManualAssemblyProbability = random.NextBoolean();
+            double manualAssemblyProbability = random.NextDouble();
 
             var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
                 TailorMadeAssessmentResult = tailorMadeAssessmentResult,
                 TailorMadeAssessmentProbability = tailorMadeAssessmentProbability,
-                UseManualAssemblyProbability = useManualAssessmentProbability,
-                ManualAssemblyProbability = manualAssessmentProbability
+                UseManualAssemblyProbability = useManualAssemblyProbability,
+                ManualAssemblyProbability = manualAssemblyProbability
             };
 
             var registry = new PersistenceRegistry();
@@ -91,8 +91,8 @@
             Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
             Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
             Assert.AreEqual(tailorMadeAssessmentProbability, entity.TailorMadeAssessmentProbability);
-            Assert.AreEqual(Convert.ToByte(useManualAssessmentProbability), entity.UseManualAssemblyProbability);
-            Assert.AreEqual(manualAssessmentProbability, entity.ManualAssemblyProbability);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyProbability), entity.UseManualAssemblyProbability);
+            Assert.AreEqual(manualAssemblyProbability, entity.ManualAssemblyProbability);
 
             Assert.IsNull(entity.GrassCoverErosionInwardsCalculationEntity);
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -ra72851067e1c8bfd2022b9bbeb805fc147a0ada9 -r58d429ac22e6e6cb36de3b1d3b18c63500675049
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision a72851067e1c8bfd2022b9bbeb805fc147a0ada9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision 58d429ac22e6e6cb36de3b1d3b18c63500675049)
@@ -68,17 +68,17 @@
             var detailedAssessmentResult = random.NextEnumValue<DetailedAssessmentProbabilityOnlyResultType>();
             var tailorMadeAssessmentResult = random.NextEnumValue<TailorMadeAssessmentProbabilityCalculationResultType>();
             double tailorMadeAssessmentProbability = random.NextDouble();
-            bool useManualAssessmentProbability = random.NextBoolean();
-            double manualAssessmentProbability = random.NextDouble();
+            bool useManualAssemblyProbability = random.NextBoolean();
+            double manualAssemblyProbability = random.NextDouble();
 
             var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 SimpleAssessmentResult = simpleAssessmentResult,
                 DetailedAssessmentResult = detailedAssessmentResult,
                 TailorMadeAssessmentResult = tailorMadeAssessmentResult,
                 TailorMadeAssessmentProbability = tailorMadeAssessmentProbability,
-                UseManualAssemblyProbability = useManualAssessmentProbability,
-                ManualAssemblyProbability = manualAssessmentProbability
+                UseManualAssemblyProbability = useManualAssemblyProbability,
+                ManualAssemblyProbability = manualAssemblyProbability
             };
 
             // Call
@@ -89,8 +89,8 @@
             Assert.AreEqual(Convert.ToByte(detailedAssessmentResult), entity.DetailedAssessmentResult);
             Assert.AreEqual(Convert.ToByte(tailorMadeAssessmentResult), entity.TailorMadeAssessmentResult);
             Assert.AreEqual(tailorMadeAssessmentProbability, entity.TailorMadeAssessmentProbability);
-            Assert.AreEqual(Convert.ToByte(useManualAssessmentProbability), entity.UseManualAssemblyProbability);
-            Assert.AreEqual(manualAssessmentProbability, entity.ManualAssemblyProbability);
+            Assert.AreEqual(Convert.ToByte(useManualAssemblyProbability), entity.UseManualAssemblyProbability);
+            Assert.AreEqual(manualAssemblyProbability, entity.ManualAssemblyProbability);
 
             Assert.IsNull(entity.StabilityPointStructuresCalculationEntityId);
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -rddb88b5bdd3b694ca96197e3b277c8096ce91cb9 -r58d429ac22e6e6cb36de3b1d3b18c63500675049
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs)	(revision ddb88b5bdd3b694ca96197e3b277c8096ce91cb9)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs)	(revision 58d429ac22e6e6cb36de3b1d3b18c63500675049)
@@ -26,7 +26,6 @@
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Primitives;
 using Ringtoets.GrassCoverErosionInwards.Data;
 
@@ -121,9 +120,6 @@
         public void Read_EntityWithNullValues_SectionResultWithNaNValues()
         {
             // Setup
-            var random = new Random(21);
-            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
-
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();