Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseReaderTest.cs
===================================================================
diff -u -r733d0d51adf737c52704cd80705507fdb34a2ba3 -rfc22f4b149d07797f0526f04ca58595bb9446786
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseReaderTest.cs	(.../HydraulicBoundaryDatabaseReaderTest.cs)	(revision 733d0d51adf737c52704cd80705507fdb34a2ba3)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseReaderTest.cs	(.../HydraulicBoundaryDatabaseReaderTest.cs)	(revision fc22f4b149d07797f0526f04ca58595bb9446786)
@@ -28,7 +28,6 @@
 using Core.Common.TestUtil;
 using Core.Common.Utils.Builders;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Data;
 using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabaseContext;
 using Ringtoets.HydraRing.IO.Properties;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
@@ -193,13 +192,13 @@
         public void GetRegionId_ValidFile_ExpectedValues()
         {
             // Setup
-            const int expectedRegionId = 13;
+            const long expectedRegionId = 13;
             var dbFile = Path.Combine(testDataPath, "complete.sqlite");
 
             using (HydraulicBoundarySqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = new HydraulicBoundarySqLiteDatabaseReader(dbFile))
             {
                 // Call
-                int regionId = hydraulicBoundarySqLiteDatabaseReader.GetRegionId();
+                long regionId = hydraulicBoundarySqLiteDatabaseReader.GetRegionId();
 
                 // Assert
                 Assert.AreEqual(expectedRegionId, regionId);
@@ -287,10 +286,10 @@
             {
                 // Call
                 hydraulicBoundarySqLiteDatabaseReader.PrepareReadLocation();
-                HydraulicBoundaryLocation location = hydraulicBoundarySqLiteDatabaseReader.ReadLocation();
+                HrdLocation location = hydraulicBoundarySqLiteDatabaseReader.ReadLocation();
 
                 // Assert
-                Assert.IsInstanceOf<HydraulicBoundaryLocation>(location);
+                Assert.IsInstanceOf<HrdLocation>(location);
             }
             Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile));
         }
@@ -301,7 +300,7 @@
             // Setup
             const int nrOfLocations = 18;
             var dbFile = Path.Combine(testDataPath, "complete.sqlite");
-            var boundaryLocations = new List<HydraulicBoundaryLocation>();
+            var boundaryLocations = new List<HrdLocation>();
             CollectionAssert.IsEmpty(boundaryLocations);
 
             using (HydraulicBoundarySqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = new HydraulicBoundarySqLiteDatabaseReader(dbFile))
@@ -318,7 +317,7 @@
                 Assert.IsNull(hydraulicBoundarySqLiteDatabaseReader.ReadLocation());
             }
 
-            CollectionAssert.AllItemsAreInstancesOfType(boundaryLocations, typeof(HydraulicBoundaryLocation));
+            CollectionAssert.AllItemsAreInstancesOfType(boundaryLocations, typeof(HrdLocation));
             Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile));
         }
 
@@ -373,7 +372,7 @@
             Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition failed: The file should be writable to begin with.");
 
             HydraulicBoundarySqLiteDatabaseReader hydraulicBoundarySqLiteDatabaseReader = null;
-            HydraulicBoundaryLocation boundaryLocation;
+            HrdLocation boundaryLocation;
             try
             {
                 hydraulicBoundarySqLiteDatabaseReader = new HydraulicBoundarySqLiteDatabaseReader(dbFile);