Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r88b44f34ed4dd17abbc44d54932215754cfd0601
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 88b44f34ed4dd17abbc44d54932215754cfd0601)
@@ -69,7 +69,7 @@
             using (var view = new DesignWaterLevelLocationsView())
             {
                 // Assert
-                Assert.IsInstanceOf<HydraulicBoundaryLocationsView>(view);
+                Assert.IsInstanceOf<HydraulicBoundaryLocationsView<DesignWaterLevelLocationRow>>(view);
                 Assert.IsNull(view.Data);
             }
         }
@@ -150,7 +150,7 @@
         {
             // Setup
             DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
-            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            IAssessmentSection assessmentSection = view.AssessmentSection;
             HydraulicBoundaryDatabase newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
@@ -163,8 +163,9 @@
             var rows = dataGridView.Rows;
             Assert.AreEqual(3, rows.Count);
 
-            // Call
             assessmentSection.HydraulicBoundaryDatabase = newHydraulicBoundaryDatabase;
+
+            // Call
             assessmentSection.NotifyObservers();
 
             // Assert
@@ -183,7 +184,7 @@
         {
             // Setup
             DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
-            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
+            IAssessmentSection assessmentSection = view.AssessmentSection;
 
             // Precondition
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -211,7 +212,7 @@
         {
             // Setup
             DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
-            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;
@@ -291,7 +292,8 @@
                 HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
             };
 
-            view.Data = assessmentSection;
+            view.Data = assessmentSection.HydraulicBoundaryDatabase.Locations;
+            view.AssessmentSection = assessmentSection;
             return view;
         }