Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r5a58d1cc2aa83be2f3217fd764b7d324c70bfc13 -rd31a3249d32f54af091fadacfb5a5ca59df18e29
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 5a58d1cc2aa83be2f3217fd764b7d324c70bfc13)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision d31a3249d32f54af091fadacfb5a5ca59df18e29)
@@ -87,13 +87,19 @@
             Assert.AreEqual(0, testLocation.Id);
             Assert.IsEmpty(testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-            Assert.AreEqual(designWaterLevelValue, testLocation.DesignWaterLevel, testLocation.DesignWaterLevel.GetAccuracy());
-            Assert.IsNaN(testLocation.WaveHeight);
 
             HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(designWaterLevelValue);
             HydraulicBoundaryLocationCalculation designWaterLevelCalculation = testLocation.DesignWaterLevelCalculation;
             AssertAreEqual(expectedDesignWaterLevelOutput, designWaterLevelCalculation.Output);
             Assert.IsNull(designWaterLevelCalculation.Output.GeneralResult);
+
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
         }
 
         [Test]
@@ -110,13 +116,20 @@
             Assert.AreEqual(0, testLocation.Id);
             Assert.IsEmpty(testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-            Assert.IsNaN(testLocation.DesignWaterLevel);
-            Assert.AreEqual(waveHeightValue, testLocation.WaveHeight, testLocation.WaveHeight.GetAccuracy());
 
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
+
             HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(waveHeightValue);
             HydraulicBoundaryLocationCalculation waveHeightCalculation = testLocation.WaveHeightCalculation;
             AssertAreEqual(expectedWaveHeightOutput, waveHeightCalculation.Output);
             Assert.IsNull(waveHeightCalculation.Output.GeneralResult);
+
+            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
         }
 
         [Test]
@@ -130,20 +143,24 @@
             Assert.AreEqual(0, testLocation.Id);
             Assert.IsEmpty(testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-            const double designWaterLevelValue = 4.5;
-            const double waveHeightValue = 5.5;
-            Assert.AreEqual(designWaterLevelValue, testLocation.DesignWaterLevel, testLocation.DesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(waveHeightValue, testLocation.WaveHeight, testLocation.WaveHeight.GetAccuracy());
 
-            HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(designWaterLevelValue);
+            HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(4.5);
             HydraulicBoundaryLocationCalculation designWaterLevelCalculation = testLocation.DesignWaterLevelCalculation;
             AssertAreEqual(expectedDesignWaterLevelOutput, designWaterLevelCalculation.Output);
             Assert.IsNull(designWaterLevelCalculation.Output.GeneralResult);
 
-            HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(waveHeightValue);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
+
+            HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(5.5);
             HydraulicBoundaryLocationCalculation waveHeightCalculation = testLocation.WaveHeightCalculation;
             AssertAreEqual(expectedWaveHeightOutput, waveHeightCalculation.Output);
             Assert.IsNull(waveHeightCalculation.Output.GeneralResult);
+
+            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
         }
 
         private static HydraulicBoundaryLocationOutput CreateHydraulicBoundaryLocationOutput(double result)
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs
===================================================================
diff -u -r21247af98062ee0734c9c8a80f7dd7483463ee61 -rd31a3249d32f54af091fadacfb5a5ca59df18e29
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 21247af98062ee0734c9c8a80f7dd7483463ee61)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision d31a3249d32f54af091fadacfb5a5ca59df18e29)
@@ -30,18 +30,18 @@
     public class TestHydraulicBoundaryLocation : HydraulicBoundaryLocation
     {
         /// <summary>
+        /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/>.
+        /// </summary>
+        public TestHydraulicBoundaryLocation() : this(null, null) {}
+
+        /// <summary>
         /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/>
         /// with the given name.
         /// </summary>
         /// <param name="name">The name for the <see cref="TestHydraulicBoundaryLocation"/>.</param>
         public TestHydraulicBoundaryLocation(string name) : base(0, name, 0, 0) {}
 
         /// <summary>
-        /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/>.
-        /// </summary>
-        public TestHydraulicBoundaryLocation() : this(null, null) {}
-
-        /// <summary>
         /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with 
         /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set.
         /// </summary>
@@ -55,6 +55,7 @@
                 DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput(
                     designWaterLevel.Value, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null);
             }
+
             if (waveHeight.HasValue)
             {
                 WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput(