Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r8bb6e849266ec28412ebfe23beccd7235c4db9bf
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
@@ -40,8 +40,11 @@
             Assert.IsEmpty(testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
 
-            Assert.IsNull(testLocation.DesignWaterLevelOutput);
-            Assert.IsNull(testLocation.WaveHeightOutput);
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculation>(testLocation.DesignWaterLevelCalculation);
+            Assert.IsInstanceOf<HydraulicBoundaryLocationCalculation>(testLocation.WaveHeightCalculation);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation.Output);
+
             Assert.IsNaN(testLocation.DesignWaterLevel);
             Assert.IsNaN(testLocation.WaveHeight);
             Assert.AreEqual(CalculationConvergence.NotCalculated, testLocation.DesignWaterLevelCalculationConvergence);
@@ -63,8 +66,9 @@
             Assert.AreEqual(name, testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
 
-            Assert.IsNull(testLocation.DesignWaterLevelOutput);
-            Assert.IsNull(testLocation.WaveHeightOutput);
+            Assert.IsNull(testLocation.DesignWaterLevelCalculation.Output);
+            Assert.IsNull(testLocation.WaveHeightCalculation.Output);
+
             Assert.IsNaN(testLocation.DesignWaterLevel);
             Assert.IsNaN(testLocation.WaveHeight);
             Assert.AreEqual(CalculationConvergence.NotCalculated, testLocation.DesignWaterLevelCalculationConvergence);
@@ -91,8 +95,7 @@
             Assert.AreEqual(CalculationConvergence.NotCalculated, testLocation.WaveHeightCalculationConvergence);
 
             HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(designWaterLevelValue);
-            AssertAreEqual(expectedDesignWaterLevelOutput, testLocation.DesignWaterLevelOutput);
-            Assert.IsNull(testLocation.WaveHeightOutput);
+            AssertAreEqual(expectedDesignWaterLevelOutput, testLocation.DesignWaterLevelCalculation.Output);
         }
 
         [Test]
@@ -114,9 +117,8 @@
             Assert.AreEqual(CalculationConvergence.NotCalculated, testLocation.DesignWaterLevelCalculationConvergence);
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, testLocation.WaveHeightCalculationConvergence);
 
-            Assert.IsNull(testLocation.DesignWaterLevelOutput);
             HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(waveHeightValue);
-            AssertAreEqual(expectedWaveHeightOutput, testLocation.WaveHeightOutput);
+            AssertAreEqual(expectedWaveHeightOutput, testLocation.WaveHeightCalculation.Output);
         }
 
         [Test]
@@ -138,9 +140,9 @@
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, testLocation.WaveHeightCalculationConvergence);
 
             HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(designWaterLevelValue);
-            AssertAreEqual(expectedDesignWaterLevelOutput, testLocation.DesignWaterLevelOutput);
+            AssertAreEqual(expectedDesignWaterLevelOutput, testLocation.DesignWaterLevelCalculation.Output);
             HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(waveHeightValue);
-            AssertAreEqual(expectedWaveHeightOutput, testLocation.WaveHeightOutput);
+            AssertAreEqual(expectedWaveHeightOutput, testLocation.WaveHeightCalculation.Output);
         }
 
         private static HydraulicBoundaryLocationOutput CreateHydraulicBoundaryLocationOutput(double result)