Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -r6bcdff0fb49046e390e33c4ec904580bc7677450 -re5f26d97bb506d502aa9d4b2dc592a598e2d956d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs)	(revision 6bcdff0fb49046e390e33c4ec904580bc7677450)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs)	(revision e5f26d97bb506d502aa9d4b2dc592a598e2d956d)
@@ -149,8 +149,6 @@
 
             // Assert
             Assert.IsNotNull(location);
-            Assert.AreEqual(designWaterLevel, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(waveHeight, location.WaveHeight, location.WaveHeight.GetAccuracy());
             AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, location.DesignWaterLevelCalculation.Output);
             AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, location.WaveHeightCalculation.Output);
         }
@@ -220,16 +218,14 @@
 
             // Assert
             Assert.IsNotNull(location);
-            Assert.AreEqual(designWaterLevel, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(waveHeight, location.WaveHeight, location.WaveHeight.GetAccuracy());
 
             HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation;
             AssertShouldIllustrationPointsBeCalculated(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation);
-            AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, location.DesignWaterLevelCalculation.Output);
+            AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, designWaterLevelCalculation.Output);
 
             HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation;
             AssertShouldIllustrationPointsBeCalculated(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation);
-            AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, location.WaveHeightCalculation.Output);
+            AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, waveHeightCalculation.Output);
         }
 
         [Test]
@@ -265,6 +261,7 @@
                 Assert.IsNull(actual);
                 return;
             }
+
             Assert.IsNotNull(expected.Result);
             Assert.AreEqual((RoundedDouble) expected.Result, actual.Result, actual.Result.GetAccuracy());
             Assert.IsNotNull(expected.TargetReliability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -ra096cb901099c85dbaafa2dba6c69288464c248e -re5f26d97bb506d502aa9d4b2dc592a598e2d956d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision a096cb901099c85dbaafa2dba6c69288464c248e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision e5f26d97bb506d502aa9d4b2dc592a598e2d956d)
@@ -94,11 +94,11 @@
             Assert.AreEqual(y, location.Location.Y, 1e-6);
 
             HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation;
-            AssertShouldIllustrationPointsBeCalculated(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation);
+            Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
             Assert.IsFalse(designWaterLevelCalculation.HasOutput);
 
             HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation;
-            AssertShouldIllustrationPointsBeCalculated(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation);
+            Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
             Assert.IsFalse(waveHeightCalculation.HasOutput);
 
             Assert.IsTrue(collector.Contains(entity));
@@ -153,16 +153,14 @@
 
             // Assert
             Assert.IsNotNull(location);
-            Assert.AreEqual(designWaterLevel, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(waveHeight, location.WaveHeight, location.WaveHeight.GetAccuracy());
 
             HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation;
-            AssertShouldIllustrationPointsBeCalculated(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation);
-            AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, location.DesignWaterLevelCalculation.Output);
+            Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
+            AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, designWaterLevelCalculation.Output);
 
             HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation;
-            AssertShouldIllustrationPointsBeCalculated(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation);
-            AssertHydraulicBoundaryLocationOutput(waveHeightOutputEntity, location.WaveHeightCalculation.Output);
+            Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
+            AssertHydraulicBoundaryLocationOutput(waveHeightOutputEntity, waveHeightCalculation.Output);
         }
 
         [Test]
@@ -230,16 +228,14 @@
 
             // Assert
             Assert.IsNotNull(location);
-            Assert.AreEqual(designWaterLevel, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(waveHeight, location.WaveHeight, location.WaveHeight.GetAccuracy());
 
             HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation;
-            AssertShouldIllustrationPointsBeCalculated(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation);
-            AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, location.DesignWaterLevelCalculation.Output);
+            Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
+            AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, designWaterLevelCalculation.Output);
 
             HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation;
-            AssertShouldIllustrationPointsBeCalculated(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation);
-            AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, location.WaveHeightCalculation.Output);
+            Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
+            AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, waveHeightCalculation.Output);
         }
 
         [Test]
@@ -261,19 +257,14 @@
             Assert.AreSame(location1, location2);
         }
 
-        private static void AssertShouldIllustrationPointsBeCalculated(bool shouldIllustrationPointsBeCalculated,
-                                                                       HydraulicBoundaryLocationCalculation calculation)
-        {
-            Assert.AreEqual(shouldIllustrationPointsBeCalculated, calculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-        }
-
         private static void AssertHydraulicBoundaryLocationOutput(IHydraulicLocationOutputEntity expected, HydraulicBoundaryLocationOutput actual)
         {
             if (expected == null)
             {
                 Assert.IsNull(actual);
                 return;
             }
+
             Assert.IsNotNull(expected.Result);
             Assert.AreEqual((RoundedDouble) expected.Result, actual.Result, actual.Result.GetAccuracy());
             Assert.IsNotNull(expected.TargetReliability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rf6dd19ee061fc2754d81eb3677c26fbdb504fc49 -re5f26d97bb506d502aa9d4b2dc592a598e2d956d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision f6dd19ee061fc2754d81eb3677c26fbdb504fc49)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs	(.../PipingCalculationEntityReadExtensionsTest.cs)	(revision e5f26d97bb506d502aa9d4b2dc592a598e2d956d)
@@ -214,7 +214,7 @@
 
             // Assert
             Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation);
-            Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevel, calculation.InputParameters.AssessmentLevel);
+            Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.Result, calculation.InputParameters.AssessmentLevel);
         }
 
         [Test]