Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r01782033c49f0510e5a622c161c14fa8e7a56138
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision e38a7c2baca2872af6319d535c6468133ea31fbc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision 01782033c49f0510e5a622c161c14fa8e7a56138)
@@ -64,15 +64,14 @@
         }
 
         [Test]
-        [TestCase(AssessmentLayerOneState.NotAssessed)]
-        [TestCase(AssessmentLayerOneState.NeedsDetailedAssessment)]
-        [TestCase(AssessmentLayerOneState.Sufficient)]
-        public void Read_WithDecimalParameterValues_ReturnHeightStructuresSectionResultWithDoubleParameterValues(
-            AssessmentLayerOneState layerOne)
+        public void Read_ParameterValues_SectionResultWithParameterValues(
+            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NeedsDetailedAssessment,
+                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState layerOne,
+            [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed,
+                AssessmentLayerTwoAResult.Successful)] AssessmentLayerTwoAResult layerTwoA,
+            [Values(1.1, 2.2, null)] double? layerThree)
         {
             // Setup
-            var random = new Random(21);
-            double layerThree = random.NextDouble();
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
@@ -90,35 +89,12 @@
 
             // Assert
             Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
-            Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
+            Assert.AreEqual(layerThree ?? double.NaN, sectionResult.AssessmentLayerThree, 1e-6);
             Assert.IsNotNull(sectionResult);
-
             Assert.IsNull(sectionResult.Calculation);
         }
 
         [Test]
-        public void Read_WithNullParameterValues_ReturnHeightStructuresSectionResultWithNullParameters()
-        {
-            // Setup
-            var collector = new ReadConversionCollector();
-            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
-            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
-            var entity = new HeightStructuresSectionResultEntity
-            {
-                LayerOne = Convert.ToByte(true),
-                LayerThree = null,
-                FailureMechanismSectionEntity = failureMechanismSectionEntity
-            };
-            var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
-
-            // Call
-            entity.Read(sectionResult, collector);
-
-            // Assert
-            Assert.IsNaN(sectionResult.AssessmentLayerThree);
-        }
-
-        [Test]
         public void Read_CalculationEntitySet_ReturnHeightStructuresSectionResultWithCalculation()
         {
             // Setup