Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs
===================================================================
diff -u -r9935f7d9c5671a9de59ac50afa327feb51df8ed7 -r1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs	(.../DesignWaterLevelLocationPropertiesTest.cs)	(revision 9935f7d9c5671a9de59ac50afa327feb51df8ed7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs	(.../DesignWaterLevelLocationPropertiesTest.cs)	(revision 1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f)
@@ -67,7 +67,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
             var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
@@ -82,7 +82,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
             var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
@@ -154,7 +154,7 @@
                                                                                       generalResult);
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
             {
                 Output = hydraulicBoundaryLocationOutput
             };
@@ -192,7 +192,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
             var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
@@ -287,7 +287,7 @@
             mocks.ReplayAll();
 
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
             {
                 InputParameters =
                 {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs
===================================================================
diff -u -rb8610606f1d2355961aeb63328f6ad13ab22f46f -r1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs	(.../DesignWaterLevelLocationsPropertiesTest.cs)	(revision b8610606f1d2355961aeb63328f6ad13ab22f46f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs	(.../DesignWaterLevelLocationsPropertiesTest.cs)	(revision 1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f)
@@ -61,7 +61,7 @@
 
             // Call
             var properties = new DesignWaterLevelLocationsProperties(hydraulicBoundaryLocations,
-                                                                     hbl => new HydraulicBoundaryLocationCalculation());
+                                                                     hbl => new HydraulicBoundaryLocationCalculation(hbl));
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationsProperties>(properties);
@@ -72,19 +72,18 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var location = new TestHydraulicBoundaryLocation();
-            var calculation = new HydraulicBoundaryLocationCalculation
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
             {
                 Output = new TestHydraulicBoundaryLocationOutput(1.5)
             };
-            var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>
-            {
-                location
-            };
 
             // Call
-            var properties = new DesignWaterLevelLocationsProperties(hydraulicBoundaryLocations,
-                                                                     hbl => calculation);
+            var properties = new DesignWaterLevelLocationsProperties(new ObservableList<HydraulicBoundaryLocation>
+                                                                     {
+                                                                         hydraulicBoundaryLocation
+                                                                     },
+                                                                     hbl => hydraulicBoundaryLocationCalculation);
 
             // Assert
             CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(DesignWaterLevelLocationProperties));
@@ -93,11 +92,11 @@
                 ExpandableArrayConverter>(nameof(DesignWaterLevelLocationsProperties.Locations));
 
             DesignWaterLevelLocationProperties designWaterLevelLocationProperties = properties.Locations.First();
-            Assert.AreEqual(location.Name, designWaterLevelLocationProperties.Name);
-            Assert.AreEqual(location.Id, designWaterLevelLocationProperties.Id);
-            Assert.AreEqual(location.Location, designWaterLevelLocationProperties.Location);
+            Assert.AreEqual(hydraulicBoundaryLocation.Name, designWaterLevelLocationProperties.Name);
+            Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelLocationProperties.Id);
+            Assert.AreEqual(hydraulicBoundaryLocation.Location, designWaterLevelLocationProperties.Location);
 
-            RoundedDouble designWaterLevel = calculation.Output.Result;
+            RoundedDouble designWaterLevel = hydraulicBoundaryLocationCalculation.Output.Result;
             Assert.AreEqual(designWaterLevel, designWaterLevelLocationProperties.DesignWaterLevel, designWaterLevel.GetAccuracy());
         }
 
@@ -106,7 +105,7 @@
         {
             // Call
             var properties = new DesignWaterLevelLocationsProperties(new ObservableList<HydraulicBoundaryLocation>(),
-                                                                     hbl => new HydraulicBoundaryLocationCalculation());
+                                                                     hbl => new HydraulicBoundaryLocationCalculation(hbl));
 
             // Assert
             TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs
===================================================================
diff -u -r9935f7d9c5671a9de59ac50afa327feb51df8ed7 -r1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs	(.../WaveHeightLocationPropertiesTest.cs)	(revision 9935f7d9c5671a9de59ac50afa327feb51df8ed7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs	(.../WaveHeightLocationPropertiesTest.cs)	(revision 1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f)
@@ -66,7 +66,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
             var properties = new WaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
@@ -81,7 +81,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
             var properties = new WaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
@@ -158,7 +158,7 @@
                                                                                       generalResult);
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
             {
                 Output = hydraulicBoundaryLocationOutput
             };
@@ -195,7 +195,7 @@
         {
             // Setup
             HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
 
             // Call
             var properties = new WaveHeightLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
@@ -290,7 +290,7 @@
             mocks.ReplayAll();
 
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
             {
                 InputParameters =
                 {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsPropertiesTest.cs
===================================================================
diff -u -rb8610606f1d2355961aeb63328f6ad13ab22f46f -r1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsPropertiesTest.cs	(.../WaveHeightLocationsPropertiesTest.cs)	(revision b8610606f1d2355961aeb63328f6ad13ab22f46f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsPropertiesTest.cs	(.../WaveHeightLocationsPropertiesTest.cs)	(revision 1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f)
@@ -61,7 +61,7 @@
 
             // Call
             var properties = new WaveHeightLocationsProperties(hydraulicBoundaryDatabase,
-                                                               hbl => new HydraulicBoundaryLocationCalculation());
+                                                               hbl => new HydraulicBoundaryLocationCalculation(hbl));
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationsProperties>(properties);
@@ -72,19 +72,18 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var location = new TestHydraulicBoundaryLocation();
-            var calculation = new HydraulicBoundaryLocationCalculation
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
             {
                 Output = new TestHydraulicBoundaryLocationOutput(1.5)
             };
-            var hydraulicBoundaryDatabase = new ObservableList<HydraulicBoundaryLocation>
-            {
-                location
-            };
 
             // Call
-            var properties = new WaveHeightLocationsProperties(hydraulicBoundaryDatabase,
-                                                               hbl => calculation);
+            var properties = new WaveHeightLocationsProperties(new ObservableList<HydraulicBoundaryLocation>
+                                                               {
+                                                                   hydraulicBoundaryLocation
+                                                               },
+                                                               hbl => hydraulicBoundaryLocationCalculation);
 
             // Assert
             CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(WaveHeightLocationProperties));
@@ -93,11 +92,11 @@
                 ExpandableArrayConverter>(nameof(WaveHeightLocationsProperties.Locations));
 
             WaveHeightLocationProperties waveHeightLocationProperties = properties.Locations.First();
-            Assert.AreEqual(location.Name, waveHeightLocationProperties.Name);
-            Assert.AreEqual(location.Id, waveHeightLocationProperties.Id);
-            Assert.AreEqual(location.Location, waveHeightLocationProperties.Location);
+            Assert.AreEqual(hydraulicBoundaryLocation.Name, waveHeightLocationProperties.Name);
+            Assert.AreEqual(hydraulicBoundaryLocation.Id, waveHeightLocationProperties.Id);
+            Assert.AreEqual(hydraulicBoundaryLocation.Location, waveHeightLocationProperties.Location);
 
-            RoundedDouble waveHeight = calculation.Output.Result;
+            RoundedDouble waveHeight = hydraulicBoundaryLocationCalculation.Output.Result;
             Assert.AreEqual(waveHeight, waveHeightLocationProperties.WaveHeight, waveHeight.GetAccuracy());
         }
 
@@ -106,7 +105,7 @@
         {
             // Call
             var properties = new WaveHeightLocationsProperties(new ObservableList<HydraulicBoundaryLocation>(),
-                                                               hbl => new HydraulicBoundaryLocationCalculation());
+                                                               hbl => new HydraulicBoundaryLocationCalculation(hbl));
 
             // Assert
             TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);