Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r2b3684cd1c1286073a9a3a3181bc6cdbf321c27f -r5f3e5513a4ff3a5ed55e0352f1e1a1d423199897
--- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 2b3684cd1c1286073a9a3a3181bc6cdbf321c27f)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 5f3e5513a4ff3a5ed55e0352f1e1a1d423199897)
@@ -43,7 +43,8 @@
     public class HydraulicBoundaryLocationCalculationActivityFactoryTest
     {
         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 CreateWaveHeightCalculationActivities_CalculationsNull_ThrowsArgumentNullException()
@@ -267,8 +268,11 @@
 
         private static void ConfigureAssessmentSection(IAssessmentSection assessmentSection, bool usePreprocessorClosure)
         {
-            assessmentSection.HydraulicBoundaryData.FilePath = validFilePath;
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData, usePreprocessorClosure);
+            assessmentSection.HydraulicBoundaryData.FilePath = validHrdFilePath;
+
+            HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings = assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings;
+            hydraulicLocationConfigurationSettings.FilePath = validHlcdFilePath;
+            hydraulicLocationConfigurationSettings.UsePreprocessorClosure = usePreprocessorClosure;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r2b3684cd1c1286073a9a3a3181bc6cdbf321c27f -r5f3e5513a4ff3a5ed55e0352f1e1a1d423199897
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision 2b3684cd1c1286073a9a3a3181bc6cdbf321c27f)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision 5f3e5513a4ff3a5ed55e0352f1e1a1d423199897)
@@ -29,7 +29,6 @@
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
-using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Service.TestUtil;
 using Riskeer.DuneErosion.Data;
 using Riskeer.DuneErosion.Data.TestUtil;
@@ -44,7 +43,8 @@
     public class DuneLocationCalculationGuiServiceTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData));
-        private static readonly string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+        private static readonly string validHrdFilePath = Path.Combine(testDataPath, "complete.sqlite");
+        private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite");
 
         [Test]
         public void Constructor_ViewParentNull_ThrowArgumentNullException()
@@ -134,9 +134,12 @@
             // Setup
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
-                FilePath = validFilePath
+                FilePath = validHrdFilePath,
+                HydraulicLocationConfigurationSettings =
+                {
+                    FilePath = validHlcdFilePath
+                }
             };
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData);
 
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -164,11 +167,14 @@
             // Setup
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
-                FilePath = validFilePath
+                FilePath = validHrdFilePath,
+                HydraulicLocationConfigurationSettings =
+                {
+                    FilePath = validHlcdFilePath,
+                    UsePreprocessorClosure = true
+                }
             };
 
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData, true);
-
             const string calculationIdentifier = "1/100";
             const string duneLocationName = "duneLocationName";