Index: Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r9c794b532804be98e97cb821e4bbe4b9d50a867a
--- Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs	(.../TargetProbabilityCalculationServiceTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs	(.../TargetProbabilityCalculationServiceTest.cs)	(revision 9c794b532804be98e97cb821e4bbe4b9d50a867a)
@@ -145,8 +145,8 @@
             var valid = true;
             string folderWithoutPreprocessorClosureDatabase = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, "HydraulicBoundaryData"),
                                                                            "withoutPreprocessorClosure");
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(Path.Combine(folderWithoutPreprocessorClosureDatabase, "hlcd.sqlite"),
-                                                                               Path.Combine(folderWithoutPreprocessorClosureDatabase, "complete.sqlite"),
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(Path.Combine(folderWithoutPreprocessorClosureDatabase, "HLCD.sqlite"),
+                                                                               Path.Combine(folderWithoutPreprocessorClosureDatabase, "HRD dutch coast south.sqlite"),
                                                                                validHrdFileVersion,
                                                                                true);
 
@@ -160,7 +160,7 @@
                 Assert.AreEqual(3, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
 
-                string preprocessorClosureFilePath = Path.Combine(folderWithoutPreprocessorClosureDatabase, "hlcd_preprocClosure.sqlite");
+                string preprocessorClosureFilePath = Path.Combine(folderWithoutPreprocessorClosureDatabase, "HLCD_preprocClosure.sqlite");
                 var expectedMessage = $"Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. Fout bij het lezen van bestand '{preprocessorClosureFilePath}': het bestand bestaat niet.";
                 Assert.AreEqual(expectedMessage, msgs[1]);
 
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs
===================================================================
diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -r9c794b532804be98e97cb821e4bbe4b9d50a867a
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs	(.../HydraulicBoundaryDatabaseReaderTest.cs)	(revision 594e0982c648dcb6072a3837762ec8c2516cb070)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs	(.../HydraulicBoundaryDatabaseReaderTest.cs)	(revision 9c794b532804be98e97cb821e4bbe4b9d50a867a)
@@ -35,19 +35,18 @@
     [TestFixture]
     public class HydraulicBoundaryDatabaseReaderTest
     {
-        private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.HydraRing.IO, "HydraulicBoundaryDatabaseReader");
+        private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.HydraRing.IO, "HydraulicBoundaryDatabaseReader");
+        
+        private readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
         [Test]
         public void Constructor_ValidFile_ExpectedValues()
         {
-            // Setup
-            string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "complete.sqlite");
-
             // Call
-            using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile))
+            using (var reader = new HydraulicBoundaryDatabaseReader(validHrdFilePath))
             {
                 // Assert
-                Assert.AreEqual(hydraulicBoundaryDatabaseFile, reader.Path);
+                Assert.AreEqual(validHrdFilePath, reader.Path);
                 Assert.IsInstanceOf<SqLiteDatabaseReaderBase>(reader);
             }
         }
@@ -166,9 +165,7 @@
         public void Read_ValidFile_ReturnsReadHydraulicBoundaryDatabase()
         {
             // Setup
-            string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "complete.sqlite");
-
-            using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile))
+            using (var reader = new HydraulicBoundaryDatabaseReader(validHrdFilePath))
             {
                 // Call
                 ReadHydraulicBoundaryDatabase readDatabase = reader.Read();
@@ -226,9 +223,7 @@
         public void ReadVersion_ValidFile_ReturnsReadVersion()
         {
             // Setup
-            string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "complete.sqlite");
-
-            using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile))
+            using (var reader = new HydraulicBoundaryDatabaseReader(validHrdFilePath))
             {
                 // Call
                 string version = reader.ReadVersion();
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HydraulicBoundaryDatabaseReader/HRD dutch coast south.sqlite
===================================================================
diff -u
Binary files differ
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HydraulicBoundaryDatabaseReader/complete.sqlite
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r9c794b532804be98e97cb821e4bbe4b9d50a867a
Binary files differ