Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r12bb946c317eb37b9a2a2bafe359c0e5b69fe271 -r9fa65b50ca71b1a2558f3a7ca62a2cecbc4db9de
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 12bb946c317eb37b9a2a2bafe359c0e5b69fe271)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 9fa65b50ca71b1a2558f3a7ca62a2cecbc4db9de)
@@ -60,10 +60,10 @@
             string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite");
 
             AssessmentSectionStub assessmentSection = CreateAssessmentSection();
-            assessmentSection.HydraulicBoundaryData.FilePath = invalidFilePath;
+            assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.First().FilePath = invalidFilePath;
             ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection);
 
-            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.Locations.First());
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryData.GetLocations().First());
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r639bc65e9b69c7bc620931127e315139c8d8fb30 -r9fa65b50ca71b1a2558f3a7ca62a2cecbc4db9de
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 639bc65e9b69c7bc620931127e315139c8d8fb30)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 9fa65b50ca71b1a2558f3a7ca62a2cecbc4db9de)
@@ -59,15 +59,30 @@
             // Setup
             string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite");
 
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
             var assessmentSection = new AssessmentSectionStub
             {
                 HydraulicBoundaryData =
                 {
-                    FilePath = invalidFilePath
+                    HydraulicLocationConfigurationDatabase =
+                    {
+                        FilePath = validHlcdFilePath
+                    },
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase
+                        {
+                            FilePath = invalidFilePath,
+                            Locations =
+                            {
+                                hydraulicBoundaryLocation
+                            }
+                        }
+                    }
                 }
             };
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
             {
                 hydraulicBoundaryLocation