Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r99361fa9b5ec36e0c6e3cfffe783786b31237c3b -rca5825018a4c61a51239c9e1c2882e264892d07e
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 99361fa9b5ec36e0c6e3cfffe783786b31237c3b)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision ca5825018a4c61a51239c9e1c2882e264892d07e)
@@ -108,7 +108,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001)
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001)
                 }
             };
 
@@ -170,7 +170,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1)
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First()
                 }
             };
 
@@ -213,7 +213,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.Locations.First(hl => hl.Id == 1300001)
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(hl => hl.Id == 1300001)
                 }
             };
 
@@ -269,7 +269,7 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryData.GetLocations().First(),
                     Structure = new TestClosingStructure()
                 }
             };
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r64f84fe98cafb36dab06516a92d7aff97405f0ea -rca5825018a4c61a51239c9e1c2882e264892d07e
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 64f84fe98cafb36dab06516a92d7aff97405f0ea)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision ca5825018a4c61a51239c9e1c2882e264892d07e)
@@ -257,7 +257,7 @@
                                  HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
                                      HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
                                          hydraulicBoundaryData,
-                                         hydraulicBoundaryData.HydraulicBoundaryDatabases.First().Locations.First()),
+                                         hydraulicBoundaryData.GetLocations().First()),
                                      (HydraRingCalculationSettings) invocation.Arguments[0]);
                              })
                              .Return(calculator);
Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -r8e53a84bd2eaf591d883716ac01d6f512ce053fe -rca5825018a4c61a51239c9e1c2882e264892d07e
--- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 8e53a84bd2eaf591d883716ac01d6f512ce053fe)
+++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision ca5825018a4c61a51239c9e1c2882e264892d07e)
@@ -542,7 +542,7 @@
             HydraulicBoundaryData hydraulicBoundaryData)
         {
             // Setup
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryData.HydraulicBoundaryDatabases.First().Locations.First();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryData.GetLocations().First();
 
             var waterLevel = (RoundedDouble) 4.20;
             var a = (RoundedDouble) 1.0;