Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs
===================================================================
diff -u -rdcc0cfdb33874458e6faf61a5ea34d18680399ba -r24197b89d9e79083c1a2b3b68c652472e95d68c0
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision dcc0cfdb33874458e6faf61a5ea34d18680399ba)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision 24197b89d9e79083c1a2b3b68c652472e95d68c0)
@@ -72,7 +72,7 @@
 
         [Test]
         [TestCase(18169, 1000, 1801000)]
-        [TestCase(6, 1000, 0)]
+        [TestCase(20128, 4, 2000004)]
         public void Read_ValidFileWithoutScenarioInformation_ExpectedValues(int trackId, int hrdLocationId, int expectedLocationId)
         {
             // Setup
@@ -95,7 +95,7 @@
 
         [Test]
         [TestCase(18169, 1000, 1801000)]
-        [TestCase(6, 1000, 0)]
+        [TestCase(20128, 4, 2000004)]
         public void Read_ValidFileWithScenarioInformation_ExpectedValues(int trackId, int hrdLocationId, int expectedLocationId)
         {
             // Setup
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs
===================================================================
diff -u -rc74f59a63c89bdb7f8b8a0b30ca61b93eae91d8f -r24197b89d9e79083c1a2b3b68c652472e95d68c0
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision c74f59a63c89bdb7f8b8a0b30ca61b93eae91d8f)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 24197b89d9e79083c1a2b3b68c652472e95d68c0)
@@ -87,7 +87,7 @@
         private static ReadHydraulicLocationConfigurationDatabase Create(IEnumerable<long> locationIds,
                                                                          IEnumerable<ReadHydraulicLocationConfigurationDatabaseSettings> settings)
         {
-            return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocation(locationId, locationId + 100, 1))
+            return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocation(locationId + 100, locationId, 1))
                                                                              .ToList(),
                                                                   settings, false);
         }