Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -rcaebe0a4ed7807b5ef15ba294518529341c05900 -rb2d403b53ea5b4bba4cbe852858bf48d4d04b81e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision caebe0a4ed7807b5ef15ba294518529341c05900)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision b2d403b53ea5b4bba4cbe852858bf48d4d04b81e)
@@ -114,7 +114,9 @@
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
             ObservableList<HydraulicBoundaryLocation> locations = assessmentSection.HydraulicBoundaryDatabase.Locations;
-            var context = new DesignWaterLevelLocationsContext(locations, assessmentSection);
+            var context = new DesignWaterLevelLocationsContext(locations,
+                                                               assessmentSection,
+                                                               hbl => new HydraulicBoundaryLocationCalculation());
 
             // Call
             object viewData = info.GetViewData(context);
@@ -129,7 +131,8 @@
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
             var context = new DesignWaterLevelLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
-                                                               assessmentSection);
+                                                               assessmentSection,
+                                                               hbl => new HydraulicBoundaryLocationCalculation());
 
             using (var ringtoetsPlugin = new RingtoetsPlugin())
             {
@@ -158,10 +161,12 @@
             mocks.ReplayAll();
 
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-            var context = new DesignWaterLevelLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
-                                                               assessmentSection);
+            var locations = new ObservableList<HydraulicBoundaryLocation>();
+            var context = new DesignWaterLevelLocationsContext(locations,
+                                                               assessmentSection,
+                                                               hbl => new HydraulicBoundaryLocationCalculation());
 
-            using (var view = new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
+            using (var view = new DesignWaterLevelLocationsView(locations,
                                                                 hbl => new HydraulicBoundaryLocationCalculation(),
                                                                 new ObservableTestAssessmentSectionStub(),
                                                                 () => 0.01))
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs
===================================================================
diff -u -r9a848a7f52c953e8a44544609d919ea45ac84c6e -rb2d403b53ea5b4bba4cbe852858bf48d4d04b81e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision 9a848a7f52c953e8a44544609d919ea45ac84c6e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs	(.../WaveHeightLocationsViewInfoTest.cs)	(revision b2d403b53ea5b4bba4cbe852858bf48d4d04b81e)
@@ -115,7 +115,9 @@
             var assessmentSection = new ObservableTestAssessmentSectionStub();
             ObservableList<HydraulicBoundaryLocation> locations = assessmentSection.HydraulicBoundaryDatabase.Locations;
 
-            var context = new WaveHeightLocationsContext(locations, assessmentSection);
+            var context = new WaveHeightLocationsContext(locations,
+                                                         assessmentSection,
+                                                         hbl => new HydraulicBoundaryLocationCalculation());
 
             // Call
             object viewData = info.GetViewData(context);
@@ -129,7 +131,9 @@
         {
             // Setup
             var assessmentSection = new ObservableTestAssessmentSectionStub();
-            var context = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(), assessmentSection);
+            var context = new WaveHeightLocationsContext(new ObservableList<HydraulicBoundaryLocation>(),
+                                                         assessmentSection,
+                                                         hbl => new HydraulicBoundaryLocationCalculation());
 
             using (var ringtoetsPlugin = new RingtoetsPlugin())
             {
@@ -160,7 +164,9 @@
 
             var assessmentSection = new ObservableTestAssessmentSectionStub();
             var locations = new ObservableList<HydraulicBoundaryLocation>();
-            var context = new WaveHeightLocationsContext(locations, assessmentSection);
+            var context = new WaveHeightLocationsContext(locations,
+                                                         assessmentSection,
+                                                         hbl => new HydraulicBoundaryLocationCalculation());
 
             using (var view = new WaveHeightLocationsView(locations,
                                                           hbl => new HydraulicBoundaryLocationCalculation(),