Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs
===================================================================
diff -u -rf7a5d22408a43c70b20a9eb5ee79cb336bacdf9e -r62ff90f02ef1ff3692a32dc3eef415e51a774223
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision f7a5d22408a43c70b20a9eb5ee79cb336bacdf9e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs	(.../DesignWaterLevelLocationsViewInfoTest.cs)	(revision 62ff90f02ef1ff3692a32dc3eef415e51a774223)
@@ -32,7 +32,6 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.GuiServices;
@@ -109,28 +108,21 @@
         public void GetViewData_Always_ReturnsHydraulicBoundaryDatabase()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            var assessmentSection = new ObservableTestAssessmentSectionStub
-            {
-                HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
-            };
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var context = new DesignWaterLevelLocationsContext(assessmentSection);
 
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
-            Assert.AreSame(hydraulicBoundaryDatabase.Locations, viewData);
+            Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, viewData);
         }
 
         [Test]
         public void CreateInstance_Always_SetExpectedProperties()
         {
             // Setup
-            var assessmentSection = new ObservableTestAssessmentSectionStub
-            {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
-            };
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var context = new DesignWaterLevelLocationsContext(assessmentSection);
 
             using (var ringtoetsPlugin = new RingtoetsPlugin())
@@ -151,8 +143,6 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-
             var gui = mocks.Stub<IGui>();
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
@@ -161,9 +151,8 @@
             gui.Stub(g => g.DocumentViewController).Return(mocks.Stub<IDocumentViewController>());
             mocks.ReplayAll();
 
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var context = new DesignWaterLevelLocationsContext(assessmentSection);
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
             using (var view = new DesignWaterLevelLocationsView(new ObservableTestAssessmentSectionStub()))
             using (var ringtoetsPlugin = new RingtoetsPlugin())