Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r88b44f34ed4dd17abbc44d54932215754cfd0601
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 88b44f34ed4dd17abbc44d54932215754cfd0601)
@@ -67,7 +67,7 @@
             using (var view = new WaveHeightLocationsView())
             {
                 // Assert
-                Assert.IsInstanceOf<HydraulicBoundaryLocationsView>(view);
+                Assert.IsInstanceOf<HydraulicBoundaryLocationsView<WaveHeightLocationRow>>(view);
                 Assert.IsNull(view.Data);
             }
         }
@@ -144,7 +144,7 @@
         {
             // Setup
             WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
-            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            IAssessmentSection assessmentSection = view.AssessmentSection;
             HydraulicBoundaryDatabase newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
@@ -177,7 +177,7 @@
         {
             // Setup
             WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
-            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            IAssessmentSection assessmentSection = view.AssessmentSection;
 
             // Precondition
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -205,7 +205,7 @@
         {
             // Setup
             WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
-            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            IAssessmentSection assessmentSection = view.AssessmentSection;
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
             var rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -278,7 +278,8 @@
                 HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
             };
 
-            view.Data = assessmentSection;
+            view.Data = assessmentSection.HydraulicBoundaryDatabase.Locations;
+            view.AssessmentSection = assessmentSection;
             return view;
         }