Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationDesignWaterLevelsViewTest.cs
===================================================================
diff -u -r5c364fbf72bc3d6ad1b91bb9f42c209587bc0055 -r7057fbcd8621dc714af88e47454b9af566e769de
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationDesignWaterLevelsViewTest.cs	(.../HydraulicBoundaryLocationDesignWaterLevelsViewTest.cs)	(revision 5c364fbf72bc3d6ad1b91bb9f42c209587bc0055)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationDesignWaterLevelsViewTest.cs	(.../HydraulicBoundaryLocationDesignWaterLevelsViewTest.cs)	(revision 7057fbcd8621dc714af88e47454b9af566e769de)
@@ -68,7 +68,6 @@
                 Assert.IsInstanceOf<UserControl>(view);
                 Assert.IsInstanceOf<IView>(view);
                 Assert.IsNull(view.Data);
-                Assert.IsNull(view.AssessmentSection);
             }
         }
 
@@ -104,23 +103,23 @@
         }
 
         [Test]
-        public void Data_HydraulicBoundaryDatabase_DataSet()
+        public void Data_IAssessmentSection_DataSet()
         {
             // Setup
             using (var view = new HydraulicBoundaryLocationDesignWaterLevelsView())
             {
-                var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase();
+                var assessmentSection = new TestAssessmentSection();
 
                 // Call
-                view.Data = hydraulicBoundaryDatabase;
+                view.Data = assessmentSection;
 
                 // Assert
-                Assert.AreSame(hydraulicBoundaryDatabase, view.Data);
+                Assert.AreSame(assessmentSection, view.Data);
             }
         }
 
         [Test]
-        public void Data_OtherThanHydraulicBoundaryDatabase_DataNull()
+        public void Data_OtherThanIAssessmentSection_DataNull()
         {
             // Setup
             using (var view = new HydraulicBoundaryLocationDesignWaterLevelsView())
@@ -176,6 +175,7 @@
         {
             // Setup
             HydraulicBoundaryLocationDesignWaterLevelsView view = ShowFullyConfiguredHydraulicBoundaryLocationDesignWaterLevelsView();
+            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
             HydraulicBoundaryDatabase newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             newHydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
@@ -188,7 +188,8 @@
             Assert.AreEqual(3, rows.Count);
 
             // Call
-            view.Data = newHydraulicBoundaryDatabase;
+            assessmentSection.HydraulicBoundaryDatabase = newHydraulicBoundaryDatabase;
+            assessmentSection.NotifyObservers();
 
             // Assert
             Assert.AreEqual(1, rows.Count);
@@ -206,7 +207,7 @@
         {
             // Setup
             HydraulicBoundaryLocationDesignWaterLevelsView view = ShowFullyConfiguredHydraulicBoundaryLocationDesignWaterLevelsView();
-            IAssessmentSection section = view.AssessmentSection;
+            IAssessmentSection assessmentSection = (IAssessmentSection) view.Data;
 
             // Precondition
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -217,8 +218,8 @@
             Assert.AreEqual("NaN", rows[2].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             // Call
-            section.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.DesignWaterLevel = double.NaN);
-            section.NotifyObservers();
+            assessmentSection.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.DesignWaterLevel = double.NaN);
+            assessmentSection.NotifyObservers();
 
             // Assert
             Assert.AreEqual(3, rows.Count);
@@ -232,7 +233,8 @@
         {
             // Setup
             var view = ShowFullyConfiguredHydraulicBoundaryLocationDesignWaterLevelsView();
-            var secondHydraulicBoundaryLocation = ((HydraulicBoundaryDatabase) view.Data).Locations.Skip(1).First();
+            IAssessmentSection assessmentSection = (IAssessmentSection)view.Data;
+            var secondHydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.Skip(1).First();
 
             var mocks = new MockRepository();
             var applicationSelectionMock = mocks.StrictMock<IApplicationSelection>();
@@ -257,7 +259,8 @@
         {
             // Setup
             var view = ShowFullyConfiguredHydraulicBoundaryLocationDesignWaterLevelsView();
-            var secondHydraulicBoundaryLocation = ((HydraulicBoundaryDatabase) view.Data).Locations.Skip(1).First();
+            IAssessmentSection assessmentSection = (IAssessmentSection)view.Data;
+            var secondHydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.Skip(1).First();
 
             var mocks = new MockRepository();
             var applicationSelectionMock = mocks.StrictMock<IApplicationSelection>();
@@ -402,7 +405,7 @@
             // Assert
             var hydraulicBoundaryLocations = locations.ToArray();
             Assert.AreEqual(1, hydraulicBoundaryLocations.Length);
-            HydraulicBoundaryLocation expectedLocation = view.AssessmentSection.HydraulicBoundaryDatabase.Locations.First();
+            HydraulicBoundaryLocation expectedLocation = ((IAssessmentSection) view.Data).HydraulicBoundaryDatabase.Locations.First();
             Assert.AreEqual(expectedLocation, hydraulicBoundaryLocations.First());
             mockRepository.VerifyAll();
         }
@@ -446,8 +449,7 @@
                 HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
             };
 
-            view.Data = assessmentSection.HydraulicBoundaryDatabase;
-            view.AssessmentSection = assessmentSection;
+            view.Data = assessmentSection;
             return view;
         }