Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs
===================================================================
diff -u -rd4d9b6a1083bbc998bc5c66c4bf80f33f9941cc3 -r34a71fc218cedadbd66343c2f3ee9af14df40aa5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision d4d9b6a1083bbc998bc5c66c4bf80f33f9941cc3)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs	(.../HydraulicBoundaryDataUpdateHandlerTest.cs)	(revision 34a71fc218cedadbd66343c2f3ee9af14df40aa5)
@@ -453,23 +453,27 @@
             var duneLocationsReplacementHandler = mocks.StrictMock<IDuneLocationsReplacementHandler>();
             mocks.ReplayAll();
 
-            const string newHrdFilePath = "some/file/path";
-            const string hlcdFilePath = "some/hlcd/FilePath";
+            const string newHrdFilePath = "hrdFileNew.sqlite";
+            const string hlcdFilePath = "hlcd.sqlite";
             AssessmentSection assessmentSection = CreateAssessmentSection();
             var handler = new HydraulicBoundaryDataUpdateHandler(assessmentSection, duneLocationsReplacementHandler);
             ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create();
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
-                FilePath = "old/file/path",
+                FilePath = "hrdFileCurrent.sqlite",
                 Version = readHydraulicBoundaryDatabase.Version,
                 Locations =
                 {
                     new TestHydraulicBoundaryLocation("old location 1"),
                     new TestHydraulicBoundaryLocation("old location 2"),
                     new TestHydraulicBoundaryLocation("old location 3")
+                },
+                HydraulicLocationConfigurationSettings =
+                {
+                    FilePath = hlcdFilePath
                 }
             };
-            HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryData);
+
             assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryData.Locations);
 
             HydraulicBoundaryLocation[] locations = hydraulicBoundaryData.Locations.ToArray();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r5cecf25bf302e72d78db8e996a2e23773f5e87a6 -r34a71fc218cedadbd66343c2f3ee9af14df40aa5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 5cecf25bf302e72d78db8e996a2e23773f5e87a6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 34a71fc218cedadbd66343c2f3ee9af14df40aa5)
@@ -50,7 +50,6 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.IllustrationPoints;
 using Riskeer.Common.Data.Structures;
-using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Common.Forms.Views;
@@ -119,7 +118,8 @@
             mocks.ReplayAll();
 
             string testDataDir = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryData));
-            string testFilePath = Path.Combine(testDataDir, "complete.sqlite");
+            string hrdFilePath = Path.Combine(testDataDir, "complete.sqlite");
+            string hlcdFilePath = Path.Combine(testDataDir, "hlcd.sqlite");
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(() => null), new GuiCoreSettings()))
             {
@@ -130,10 +130,14 @@
                 {
                     HydraulicBoundaryData =
                     {
-                        FilePath = testFilePath
+                        FilePath = hrdFilePath,
+                        HydraulicLocationConfigurationSettings =
+                        {
+                            FilePath = hlcdFilePath
+                        }
                     }
                 };
-                HydraulicBoundaryDataTestHelper.SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
+
                 var project = new RiskeerProject(assessmentSection);
 
                 // When