Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r3a3631387cdee66bfc9110aeae5cd282bf2e80c6 -r2c870a94bca01f28dd8332e2512a9cf94709c88f
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 3a3631387cdee66bfc9110aeae5cd282bf2e80c6)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 2c870a94bca01f28dd8332e2512a9cf94709c88f)
@@ -81,15 +81,7 @@
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
             mocks.ReplayAll();
 
-            var hydraulicBoundaryData = new HydraulicBoundaryData
-            {
-                HydraulicLocationConfigurationDatabase =
-                {
-                    FilePath = "different/folder/hlcd.sqlite"
-                }
-            };
-            
-            var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, validHrdFilePath);
+            var importer = new HydraulicBoundaryDatabaseImporter(CreateLinkedHydraulicBoundaryData(), handler, validHrdFilePath);
 
             // Call
             var importSuccessful = true;
@@ -109,20 +101,12 @@
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
             mocks.ReplayAll();
 
-            var hydraulicBoundaryData = new HydraulicBoundaryData
+            HydraulicBoundaryData hydraulicBoundaryData = CreateLinkedHydraulicBoundaryData();
+
+            hydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
             {
-                HydraulicLocationConfigurationDatabase =
-                {
-                    FilePath = validHlcdFilePath
-                },
-                HydraulicBoundaryDatabases =
-                {
-                    new HydraulicBoundaryDatabase
-                    {
-                        FilePath = validHrdFilePath
-                    }
-                }
-            };
+                FilePath = validHrdFilePath
+            });
             
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, validHrdFilePath);
 
@@ -137,28 +121,6 @@
         }
         
         [Test]
-        public void Import_FilePathIsDirectory_CancelImportWithErrorMessage()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
-            mocks.ReplayAll();
-
-            string path = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.IO, Path.DirectorySeparatorChar.ToString());
-
-            var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryData(), handler, path);
-
-            // Call
-            var importSuccessful = true;
-            void Call() => importSuccessful = importer.Import();
-
-            // Assert
-            var expectedMessage = $"Fout bij het lezen van bestand '{path}': bestandspad mag niet verwijzen naar een lege bestandsnaam.";
-            AssertImportFailed(Call, expectedMessage, ref importSuccessful);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Import_FileDoesNotExist_CancelImportWithErrorMessage()
         {
             // Setup
@@ -733,6 +695,17 @@
             mocks.VerifyAll(); // Expect no NotifyObserver calls
         }
 
+        private static HydraulicBoundaryData CreateLinkedHydraulicBoundaryData()
+        {
+            return new HydraulicBoundaryData
+            {
+                HydraulicLocationConfigurationDatabase =
+                {
+                    FilePath = validHlcdFilePath
+                }
+            };
+        }
+        
         private static IEnumerable<TestCaseData> GetValidFiles()
         {
             return new[]