Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r04780cbac72d279ad9173eb06075caa1cc5143cf
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs)	(revision 04780cbac72d279ad9173eb06075caa1cc5143cf)
@@ -107,7 +107,7 @@
             TestHelper.AssertTypeConverter<GrassCoverErosionOutwardsDesignWaterLevelLocationProperties, NoValueRoundedDoubleConverter>(
                 nameof(GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.CalculatedReliability));
             Assert.IsEmpty(properties.Convergence);
-            Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated);
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs
===================================================================
diff -u -rf2ebd2cc0a13778b6a79feb1d5082c48de1a73cd -r04780cbac72d279ad9173eb06075caa1cc5143cf
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs)	(revision f2ebd2cc0a13778b6a79feb1d5082c48de1a73cd)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs)	(revision 04780cbac72d279ad9173eb06075caa1cc5143cf)
@@ -59,7 +59,7 @@
 
             // Call
             var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryLocations,
-                                                                                              hbl => hbl.DesignWaterLevelCalculation1);
+                                                                                              hbl => new HydraulicBoundaryLocationCalculation());
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationsProperties>(properties);
@@ -88,15 +88,19 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            HydraulicBoundaryLocation location = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(1.2);
-            var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>
+            var location = new TestHydraulicBoundaryLocation();
+            var calculation = new HydraulicBoundaryLocationCalculation
             {
+                Output = new TestHydraulicBoundaryLocationOutput(1.5)
+            };
+            var hydraulicBoundaryDatabase = new ObservableList<HydraulicBoundaryLocation>
+            {
                 location
             };
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryLocations,
-                                                                                              hbl => hbl.DesignWaterLevelCalculation1);
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryDatabase,
+                                                                                        hbl => calculation);
 
             // Assert
             Assert.AreEqual(1, properties.Locations.Length);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r04780cbac72d279ad9173eb06075caa1cc5143cf
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs)	(revision 04780cbac72d279ad9173eb06075caa1cc5143cf)
@@ -107,7 +107,7 @@
             TestHelper.AssertTypeConverter<GrassCoverErosionOutwardsWaveHeightLocationProperties, NoValueRoundedDoubleConverter>(
                 nameof(GrassCoverErosionOutwardsWaveHeightLocationProperties.CalculatedReliability));
             Assert.IsEmpty(properties.Convergence);
-            Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated);
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs
===================================================================
diff -u -r86a27f942ae8ab4b5d9e29b7eaed63db0e8cc1e7 -r04780cbac72d279ad9173eb06075caa1cc5143cf
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs)	(revision 86a27f942ae8ab4b5d9e29b7eaed63db0e8cc1e7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs)	(revision 04780cbac72d279ad9173eb06075caa1cc5143cf)
@@ -60,7 +60,7 @@
 
             // Call
             var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryLocations,
-                                                                                        hbl => hbl.DesignWaterLevelCalculation1);
+                                                                                        hbl => new HydraulicBoundaryLocationCalculation());
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationsProperties>(properties);
@@ -88,15 +88,19 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            HydraulicBoundaryLocation location = TestHydraulicBoundaryLocation.CreateWaveHeightCalculated(1.2);
-            var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>
+            var location = new TestHydraulicBoundaryLocation();
+            var calculation = new HydraulicBoundaryLocationCalculation
             {
+                Output = new TestHydraulicBoundaryLocationOutput(1.5)
+            };
+            var hydraulicBoundaryDatabase = new ObservableList<HydraulicBoundaryLocation>
+            {
                 location
             };
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryLocations,
-                                                                                        hbl => hbl.WaveHeightCalculation1);
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryDatabase,
+                                                                                        hbl => calculation);
 
             // Assert
             Assert.AreEqual(1, properties.Locations.Length);