Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r36a0872b28ab911f37fad8cd45da0784a309c7a8
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 36a0872b28ab911f37fad8cd45da0784a309c7a8)
@@ -292,16 +292,17 @@
 
         private static AssessmentSection CreateAssessmentSection()
         {
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.DikeAndDune)
+            return new AssessmentSection(AssessmentSectionComposition.DikeAndDune)
             {
                 HydraulicBoundaryData =
                 {
-                    FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite")
+                    FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"),
+                    HydraulicLocationConfigurationSettings =
+                    {
+                        FilePath = Path.Combine(testDataPath, "hlcd.sqlite")
+                    }
                 }
             };
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
-
-            return assessmentSection;
         }
 
         private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection,
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r2b3684cd1c1286073a9a3a3181bc6cdbf321c27f -r36a0872b28ab911f37fad8cd45da0784a309c7a8
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 2b3684cd1c1286073a9a3a3181bc6cdbf321c27f)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 36a0872b28ab911f37fad8cd45da0784a309c7a8)
@@ -43,7 +43,8 @@
     public class AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
-        private static readonly string validFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
+        private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
+        private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite");
 
         [Test]
         public void CreateHydraulicBoundaryLocationCalculationActivities_AssessmentSectionNull_ThrowsArgumentNullException()
@@ -390,14 +391,18 @@
 
         private static AssessmentSectionStub CreateAssessmentSection(bool usePreprocessorClosure)
         {
-            var assessmentSection = new AssessmentSectionStub();
-
-            assessmentSection.HydraulicBoundaryData.FilePath = validFilePath;
-
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData,
-                                                                                      usePreprocessorClosure);
-
-            return assessmentSection;
+            return new AssessmentSectionStub
+            {
+                HydraulicBoundaryData =
+                {
+                    FilePath = validHrdFilePath,
+                    HydraulicLocationConfigurationSettings =
+                    {
+                        FilePath = validHlcdFilePath,
+                        UsePreprocessorClosure = usePreprocessorClosure
+                    }
+                }
+            };
         }
 
         private static void AssertDesignWaterLevelCalculationActivity(Activity activity,