Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r3a0e6c2c8b7be60e18f8dff1800f30c70e67b131 -r414fbb18eff0679fdfe860c04dc6aceebeb37e51
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 3a0e6c2c8b7be60e18f8dff1800f30c70e67b131)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 414fbb18eff0679fdfe860c04dc6aceebeb37e51)
@@ -679,11 +679,6 @@
             {
                 return calculations;
             }
-
-            protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-            {
-                return hydraulicBoundaryLocation.DesignWaterLevelCalculation1;
-            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r3a0e6c2c8b7be60e18f8dff1800f30c70e67b131 -r414fbb18eff0679fdfe860c04dc6aceebeb37e51
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 3a0e6c2c8b7be60e18f8dff1800f30c70e67b131)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 414fbb18eff0679fdfe860c04dc6aceebeb37e51)
@@ -679,11 +679,6 @@
             {
                 return calculations;
             }
-
-            protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-            {
-                return hydraulicBoundaryLocation.WaveHeightCalculation1;
-            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -refe8286b63e94248270dc557a1789506805e74a1 -r414fbb18eff0679fdfe860c04dc6aceebeb37e51
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision efe8286b63e94248270dc557a1789506805e74a1)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 414fbb18eff0679fdfe860c04dc6aceebeb37e51)
@@ -289,8 +289,7 @@
                                                                getCalculationFunc,
                                                                categoryBoundaryName);
 
-            using (var view = new DesignWaterLevelLocationsView(locations,
-                                                                getCalculationFunc,
+            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                 new ObservableTestAssessmentSectionStub(),
                                                                 getNormFunc,
                                                                 categoryBoundaryName))
@@ -317,8 +316,7 @@
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                                hbl => new HydraulicBoundaryLocationCalculation(hbl),
+            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                 assessmentSection,
                                                                 () => 0.01,
                                                                 "Category"))
@@ -338,8 +336,7 @@
             var assessmentSectionA = new ObservableTestAssessmentSectionStub();
             var assessmentSectionB = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                                hbl => new HydraulicBoundaryLocationCalculation(hbl),
+            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                 assessmentSectionA,
                                                                 () => 0.01,
                                                                 "Category"))
@@ -358,8 +355,7 @@
             // Setup
             var assessmentSectionA = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                                hbl => new HydraulicBoundaryLocationCalculation(hbl),
+            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                 assessmentSectionA,
                                                                 () => 0.01,
                                                                 "Category"))
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -refe8286b63e94248270dc557a1789506805e74a1 -r414fbb18eff0679fdfe860c04dc6aceebeb37e51
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision efe8286b63e94248270dc557a1789506805e74a1)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision 414fbb18eff0679fdfe860c04dc6aceebeb37e51)
@@ -291,8 +291,7 @@
                                                          getCalculationFunc,
                                                          categoryBoundaryName);
 
-            using (var view = new WaveHeightLocationsView(locations,
-                                                          getCalculationFunc,
+            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                           assessmentSection,
                                                           getNormFunc,
                                                           categoryBoundaryName))
@@ -319,8 +318,7 @@
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
+            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                           assessmentSection,
                                                           () => 0.01,
                                                           "Category"))
@@ -340,8 +338,7 @@
             var assessmentSectionA = new ObservableTestAssessmentSectionStub();
             var assessmentSectionB = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
+            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                           assessmentSectionA,
                                                           () => 0.01,
                                                           "Category"))
@@ -360,8 +357,7 @@
             // Setup
             var assessmentSectionA = new ObservableTestAssessmentSectionStub();
 
-            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                          hbl => new HydraulicBoundaryLocationCalculation(hbl),
+            using (var view = new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                           assessmentSectionA,
                                                           () => 0.01,
                                                           "Category"))