Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r2c870a94bca01f28dd8332e2512a9cf94709c88f -r06e08db490f5112eb155169c694d3222d0928c5c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 2c870a94bca01f28dd8332e2512a9cf94709c88f)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 06e08db490f5112eb155169c694d3222d0928c5c)
@@ -107,7 +107,7 @@
             {
                 FilePath = validHrdFilePath
             });
-            
+
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, validHrdFilePath);
 
             // Call
@@ -119,7 +119,7 @@
             AssertImportFailed(Call, expectedMessage, ref importSuccessful);
             mocks.VerifyAll();
         }
-        
+
         [Test]
         public void Import_FileDoesNotExist_CancelImportWithErrorMessage()
         {
@@ -128,9 +128,9 @@
             var handler = mocks.StrictMock<IHydraulicBoundaryDataUpdateHandler>();
             mocks.ReplayAll();
 
-            string path = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.IO, "I_dont_exist");
+            string path = Path.Combine(testDataPath, "I_dont_exist.sqlite");
 
-            var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryData(), handler, path);
+            var importer = new HydraulicBoundaryDatabaseImporter(CreateLinkedHydraulicBoundaryData(), handler, path);
 
             // Call
             var importSuccessful = true;
@@ -152,7 +152,7 @@
 
             string path = Path.Combine(testDataPath, "corruptschema.sqlite");
 
-            var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryData(), handler, path);
+            var importer = new HydraulicBoundaryDatabaseImporter(CreateLinkedHydraulicBoundaryData(), handler, path);
 
             // Call
             var importSuccessful = true;
@@ -174,7 +174,7 @@
 
             string path = Path.Combine(testDataPath, "empty.sqlite");
 
-            var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryData(), handler, path);
+            var importer = new HydraulicBoundaryDatabaseImporter(CreateLinkedHydraulicBoundaryData(), handler, path);
 
             // Call
             var importSuccessful = true;
@@ -705,7 +705,7 @@
                 }
             };
         }
-        
+
         private static IEnumerable<TestCaseData> GetValidFiles()
         {
             return new[]