Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -red7c8b3131ff4acc2c754f1eafc7271a7d18718e -re0e3878b7cb13db4158ecb5e0cf21c2bd85b807e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision ed7c8b3131ff4acc2c754f1eafc7271a7d18718e)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision e0e3878b7cb13db4158ecb5e0cf21c2bd85b807e)
@@ -81,8 +81,16 @@
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
             mocks.ReplayAll();
 
-            var importer = new HydraulicBoundaryDatabaseImporter(CreateLinkedHydraulicBoundaryData(), handler, validHrdFilePath);
+            var hydraulicBoundaryData = new HydraulicBoundaryData
+            {
+                HydraulicLocationConfigurationDatabase =
+                {
+                    FilePath = "different/directory/hlcd.sqlite"
+                }
+            };
 
+            var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, validHrdFilePath);
+
             // Call
             var importSuccessful = true;
             void Call() => importSuccessful = importer.Import();
@@ -204,7 +212,7 @@
                     FilePath = Path.Combine(directory, "hlcd.sqlite")
                 }
             };
-            
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
 
             // Call
@@ -235,7 +243,7 @@
                     FilePath = hlcdFilePath
                 }
             };
-            
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
 
             // Call
@@ -266,7 +274,7 @@
                     FilePath = hlcdFilePath
                 }
             };
-            
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
 
             // Call
@@ -299,7 +307,7 @@
                     FilePath = hlcdFilePath
                 }
             };
-                
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
 
             // Call
@@ -320,10 +328,19 @@
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
             mocks.ReplayAll();
 
-            string path = Path.Combine(testDataPath, "withoutSettings", "complete.sqlite");
+            string directory = Path.Combine(testDataPath, "withoutSettings");
+            string path = Path.Combine(directory, "complete.sqlite");
 
-            var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryData(), handler, path);
+            var hydraulicBoundaryData = new HydraulicBoundaryData
+            {
+                HydraulicLocationConfigurationDatabase =
+                {
+                    FilePath = Path.Combine(directory, "hlcd.sqlite")
+                }
+            };
 
+            var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
+
             // Call
             var importSuccessful = true;
             void Call() => importSuccessful = importer.Import();
@@ -353,7 +370,7 @@
                     FilePath = Path.Combine(directory, "hlcd.sqlite")
                 }
             };
-            
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
 
             // Call
@@ -384,7 +401,7 @@
                     FilePath = hlcdFilePath
                 }
             };
-            
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, path);
 
             // Call
@@ -404,7 +421,13 @@
         {
             // Setup
             string hlcdFilePath = Path.Combine(Path.GetDirectoryName(filePath), "hlcd.sqlite");
-            var hydraulicBoundaryData = new HydraulicBoundaryData();
+            var hydraulicBoundaryData = new HydraulicBoundaryData
+            {
+                HydraulicLocationConfigurationDatabase =
+                {
+                    FilePath = hlcdFilePath
+                }
+            };
 
             var mocks = new MockRepository();
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
@@ -448,10 +471,17 @@
         public void Import_WithValidFileAndHlcdWithValidScenarioInformation_UpdatesHydraulicBoundaryDatabaseWithImportedData()
         {
             // Setup
-            var hydraulicBoundaryData = new HydraulicBoundaryData();
             string hrdFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "complete.sqlite");
             string hlcdFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "hlcd.sqlite");
 
+            var hydraulicBoundaryData = new HydraulicBoundaryData
+            {
+                HydraulicLocationConfigurationDatabase =
+                {
+                    FilePath = hlcdFilePath
+                }
+            };
+
             var mocks = new MockRepository();
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
 
@@ -498,7 +528,7 @@
 
             var progressChangeNotifications = new List<ProgressNotification>();
 
-            var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryData(), handler, validHrdFilePath);
+            var importer = new HydraulicBoundaryDatabaseImporter(CreateLinkedHydraulicBoundaryData(), handler, validHrdFilePath);
             importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
 
             // Call