Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs
===================================================================
diff -u -r0b594c2ab0b82559abe2ad8a46df4b5040bc0bfa -r9ce4da2573f0620767a157f2e1e9ad80da2ad899
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision 0b594c2ab0b82559abe2ad8a46df4b5040bc0bfa)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs	(.../AssessmentSectionTestHelper.cs)	(revision 9ce4da2573f0620767a157f2e1e9ad80da2ad899)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.IO;
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
@@ -114,7 +115,10 @@
 
             if (filePath != null)
             {
-                HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData, usePreprocessorClosure);
+                HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings = hydraulicBoundaryData.HydraulicLocationConfigurationSettings;
+
+                hydraulicLocationConfigurationSettings.FilePath = Path.Combine(Path.GetDirectoryName(filePath), "hlcd.sqlite");
+                hydraulicLocationConfigurationSettings.UsePreprocessorClosure = usePreprocessorClosure;
             }
 
             return hydraulicBoundaryData;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r50fd16b820976fabaaf6538eedfbbc7638bccb7e -r9ce4da2573f0620767a157f2e1e9ad80da2ad899
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 50fd16b820976fabaaf6538eedfbbc7638bccb7e)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 9ce4da2573f0620767a157f2e1e9ad80da2ad899)
@@ -43,7 +43,8 @@
     public class HydraulicBoundaryLocationCalculationGuiServiceTest : NUnitFormTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
-        private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite");
 
         [Test]
         public void Constructor_ViewParentNull_ThrowsArgumentNullException()
@@ -121,7 +122,7 @@
             mocks.ReplayAll();
 
             assessmentSection.HydraulicBoundaryData.FilePath = "Does not exist";
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = "Does not exist";
 
             var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
@@ -147,8 +148,8 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
             mocks.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryData.FilePath = validFilePath;
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
+            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = validHlcdFilePath;
 
             DialogBoxHandler = (name, wnd) =>
             {
@@ -190,8 +191,8 @@
                              .Return(new TestDesignWaterLevelCalculator());
             mocks.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryData.FilePath = validFilePath;
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
+            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = validHlcdFilePath;
 
             DialogBoxHandler = (name, wnd) =>
             {
@@ -279,7 +280,7 @@
             mocks.ReplayAll();
 
             assessmentSection.HydraulicBoundaryData.FilePath = "Does not exist";
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = "Does not exist";
 
             var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
@@ -304,8 +305,8 @@
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
             mocks.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryData.FilePath = validFilePath;
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
+            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = validHlcdFilePath;
 
             DialogBoxHandler = (name, wnd) =>
             {
@@ -347,8 +348,8 @@
                              .Return(new TestWaveHeightCalculator());
             mocks.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryData.FilePath = validFilePath;
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
+            assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = validHlcdFilePath;
 
             DialogBoxHandler = (name, wnd) =>
             {