Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs
===================================================================
diff -u -r135c16064b9b0569244d2b57d4ddd89a1f484ef6 -r047675017f6d9a5808efe605184328c0dce16a09
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs)	(revision 135c16064b9b0569244d2b57d4ddd89a1f484ef6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs)	(revision 047675017f6d9a5808efe605184328c0dce16a09)
@@ -19,7 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase;
 
@@ -35,13 +35,13 @@
             ReadHydraulicLocationConfigurationDatabase database = ReadHydraulicLocationConfigurationDatabaseTestFactory.Create();
 
             // Assert
-            Assert.AreEqual(2, database.LocationIds.Count);
+            Assert.AreEqual(2, database.LocationIdMappings.Count());
 
             var i = 1;
-            foreach (KeyValuePair<long, long> databaseLocationId in database.LocationIds)
+            foreach (ReadHydraulicLocationMapping databaseLocationIdMapping in database.LocationIdMappings)
             {
-                Assert.AreEqual(i, databaseLocationId.Key);
-                Assert.AreEqual(i, databaseLocationId.Value);
+                Assert.AreEqual(i, databaseLocationIdMapping.HrdLocationId);
+                Assert.AreEqual(i, databaseLocationIdMapping.HlcdLocationId);
                 i++;
             }
         }
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs
===================================================================
diff -u -r135c16064b9b0569244d2b57d4ddd89a1f484ef6 -r047675017f6d9a5808efe605184328c0dce16a09
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 135c16064b9b0569244d2b57d4ddd89a1f484ef6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision 047675017f6d9a5808efe605184328c0dce16a09)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
 using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase;
 
 namespace Ringtoets.HydraRing.IO.TestUtil
@@ -36,14 +35,10 @@
         /// <returns>The created <see cref="ReadHydraulicLocationConfigurationDatabase"/>.</returns>
         public static ReadHydraulicLocationConfigurationDatabase Create()
         {
-            return new ReadHydraulicLocationConfigurationDatabase(new Dictionary<long, long>
+            return new ReadHydraulicLocationConfigurationDatabase(new []
             {
-                {
-                    1, 1
-                },
-                {
-                    2, 2
-                }
+                new ReadHydraulicLocationMapping(1, 1), 
+                new ReadHydraulicLocationMapping(2, 2)
             });
         }
     }