Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r6ca9de762c61d3653b97632a2f02db53408e5a99 -ra451cc24b9153910681c63291b6747e26fb72c3f
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 6ca9de762c61d3653b97632a2f02db53408e5a99)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision a451cc24b9153910681c63291b6747e26fb72c3f)
@@ -195,6 +195,7 @@
                              .Return(new TestDesignWaterLevelCalculator());
             mocks.ReplayAll();
 
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
             assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath = validHlcdFilePath;
             assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
             {
@@ -365,6 +366,7 @@
                              .Return(new TestWaveHeightCalculator());
             mocks.ReplayAll();
 
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
             assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase.FilePath = validHlcdFilePath;
             assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
             {
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r6ca9de762c61d3653b97632a2f02db53408e5a99 -ra451cc24b9153910681c63291b6747e26fb72c3f
--- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 6ca9de762c61d3653b97632a2f02db53408e5a99)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision a451cc24b9153910681c63291b6747e26fb72c3f)
@@ -95,11 +95,15 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
             mocks.ReplayAll();
 
-            ConfigureAssessmentSection(assessmentSection, usePreprocessorClosure);
-
             var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation("locationName1");
             var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation("locationName2");
 
+            ConfigureAssessmentSection(assessmentSection, usePreprocessorClosure, new[]
+            {
+                hydraulicBoundaryLocation1,
+                hydraulicBoundaryLocation2
+            });
+
             // Call
             IEnumerable<CalculatableActivity> activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
                 new[]
@@ -171,11 +175,15 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
             mocks.ReplayAll();
 
-            ConfigureAssessmentSection(assessmentSection, usePreprocessorClosure);
-
             var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation("locationName1");
             var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation("locationName2");
 
+            ConfigureAssessmentSection(assessmentSection, usePreprocessorClosure, new[]
+            {
+                hydraulicBoundaryLocation1,
+                hydraulicBoundaryLocation2
+            });
+
             // Call
             IEnumerable<CalculatableActivity> activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
                 new[]
@@ -268,13 +276,24 @@
             mocks.VerifyAll();
         }
 
-        private static void ConfigureAssessmentSection(IAssessmentSection assessmentSection, bool usePreprocessorClosure)
+        private static void ConfigureAssessmentSection(IAssessmentSection assessmentSection, bool usePreprocessorClosure, IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
         {
-            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
+            HydraulicBoundaryData hydraulicBoundaryData = assessmentSection.HydraulicBoundaryData;
 
-            HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
+            hydraulicBoundaryData.FilePath = validHrdFilePath;
+
+            HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
             hydraulicLocationConfigurationDatabase.FilePath = validHlcdFilePath;
             hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = usePreprocessorClosure;
+
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validHrdFilePath
+            };
+
+            hydraulicBoundaryDatabase.Locations.AddRange(hydraulicBoundaryLocations);
+
+            hydraulicBoundaryData.HydraulicBoundaryDatabases.Add(hydraulicBoundaryDatabase);
         }
     }
 }
\ No newline at end of file