Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/DesignWaterLevelCalculationTest.cs
===================================================================
diff -u -r55e286e8436b5061a9264ec8623b525f3015fe6e -r50af72c141113a242971eeeee1e6622c40d901f6
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/DesignWaterLevelCalculationTest.cs	(.../DesignWaterLevelCalculationTest.cs)	(revision 55e286e8436b5061a9264ec8623b525f3015fe6e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/DesignWaterLevelCalculationTest.cs	(.../DesignWaterLevelCalculationTest.cs)	(revision 50af72c141113a242971eeeee1e6622c40d901f6)
@@ -62,14 +62,25 @@
         public void Constructor_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new DesignWaterLevelCalculation(null);
+            TestDelegate call = () => new DesignWaterLevelCalculation(null, new HydraulicBoundaryLocationCalculation());
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
             Assert.AreEqual("hydraulicBoundaryLocation", paramName);
         }
 
         [Test]
+        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new DesignWaterLevelCalculation(new TestHydraulicBoundaryLocation(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
+        }
+
+        [Test]
         public void Constructor_ValidHydraulicBoundaryLocation_SetsProperties(
             [Values(true, false)] bool calculateIllustrationPoints)
         {
@@ -85,15 +96,16 @@
                 }
             };
 
+            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation;
+
             // Call
-            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.IsInstanceOf<IHydraulicBoundaryWrapperCalculation>(calculation);
             Assert.AreEqual(hydraulicBoundaryLocation.Id, calculation.Id);
             Assert.AreSame(hydraulicBoundaryLocation.Name, calculation.Name);
 
-            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation;
             Assert.AreEqual(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, calculation.CalculateIllustrationPoints);
 
             Assert.AreSame(hydraulicBoundaryLocation, calculation.ObservableObject);
@@ -105,7 +117,7 @@
                                                                        bool shouldBeCalculated)
         {
             // Setup
-            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation);
 
             // Call
             bool isCalculated = calculation.IsCalculated();
@@ -119,7 +131,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation);
             var output = new TestHydraulicBoundaryLocationOutput(1);
 
             // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs
===================================================================
diff -u -r55e286e8436b5061a9264ec8623b525f3015fe6e -r50af72c141113a242971eeeee1e6622c40d901f6
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs	(.../WaveHeightCalculationTest.cs)	(revision 55e286e8436b5061a9264ec8623b525f3015fe6e)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs	(.../WaveHeightCalculationTest.cs)	(revision 50af72c141113a242971eeeee1e6622c40d901f6)
@@ -62,14 +62,25 @@
         public void Constructor_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new WaveHeightCalculation(null);
+            TestDelegate call = () => new WaveHeightCalculation(null, new HydraulicBoundaryLocationCalculation());
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
             Assert.AreEqual("hydraulicBoundaryLocation", paramName);
         }
 
         [Test]
+        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new WaveHeightCalculation(new TestHydraulicBoundaryLocation(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
+        }
+
+        [Test]
         public void Constructor_ValidHydraulicBoundaryLocation_SetsProperties(
             [Values(true, false)] bool calculateIllustrationPoints)
         {
@@ -85,15 +96,16 @@
                 }
             };
 
+            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocation.WaveHeightCalculation;
+
             // Call
-            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation);
+            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.IsInstanceOf<IHydraulicBoundaryWrapperCalculation>(calculation);
             Assert.AreEqual(hydraulicBoundaryLocation.Id, calculation.Id);
             Assert.AreSame(hydraulicBoundaryLocation.Name, calculation.Name);
 
-            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocation.WaveHeightCalculation;
             Assert.AreEqual(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, calculation.CalculateIllustrationPoints);
 
             Assert.AreSame(hydraulicBoundaryLocation, calculation.ObservableObject);
@@ -105,7 +117,7 @@
             HydraulicBoundaryLocation hydraulicBoundaryLocation, bool shouldBeCalculated)
         {
             // Setup
-            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation);
+            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation);
 
             // Call
             bool isCalculated = calculation.IsCalculated();
@@ -119,7 +131,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation);
+            var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation);
             var output = new TestHydraulicBoundaryLocationOutput(1);
 
             // Call