Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -r44d4c114a254db9859fbf71812e599c468dcbe77
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs	(.../WaveHeightLocationsContextPropertyInfoTest.cs)	(revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs	(.../WaveHeightLocationsContextPropertyInfoTest.cs)	(revision 44d4c114a254db9859fbf71812e599c468dcbe77)
@@ -45,21 +45,21 @@
 
                 // Assert
                 Assert.AreEqual(typeof(WaveHeightLocationsContext), info.DataType);
-                Assert.AreEqual(typeof(WaveHeightLocationsContextProperties), info.PropertyObjectType);
+                Assert.AreEqual(typeof(WaveHeightLocationsProperties), info.PropertyObjectType);
             }
         }
 
         [Test]
-        public void CreateInstance_Always_SetsHydraulicBoundaryDatabaseAsData()
+        public void CreateInstance_Always_SetsHydraulicBoundaryLocationsAsData()
         {
             // Setup
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
             mockRepository.ReplayAll();
 
-            var context = new WaveHeightLocationsContext(assessmentSection);
+            var context = new WaveHeightLocationsContext(hydraulicBoundaryDatabase.Locations, assessmentSection, hbl => new HydraulicBoundaryLocationCalculation());
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -69,9 +69,10 @@
                 IObjectProperties objectProperties = info.CreateInstance(context);
 
                 // Assert
-                Assert.IsInstanceOf<WaveHeightLocationsContextProperties>(objectProperties);
-                Assert.AreSame(hydraulicBoundaryDatabase, objectProperties.Data);
+                Assert.IsInstanceOf<WaveHeightLocationsProperties>(objectProperties);
+                Assert.AreSame(hydraulicBoundaryDatabase.Locations, objectProperties.Data);
             }
+
             mockRepository.VerifyAll();
         }