Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs
===================================================================
diff -u -rac027e99fa63787d279acd1e0191a7de57797551 -raffab28216d928fc119f636dca96f4b4d742e9c6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs	(.../ReadHydraulicBoundaryDatabaseTestFactoryTest.cs)	(revision ac027e99fa63787d279acd1e0191a7de57797551)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs	(.../ReadHydraulicBoundaryDatabaseTestFactoryTest.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
@@ -44,7 +44,7 @@
 
             for (var i = 0; i < locations.Length; i++)
             {
-                Assert.IsNotNull(locations[i].Id);
+                Assert.AreEqual(i+1, locations[i].Id);
                 Assert.AreEqual($"location{i+1}", locations[i].Name);
                 Assert.IsFalse(double.IsNaN(locations[i].CoordinateX));
                 Assert.IsFalse(double.IsNaN(locations[i].CoordinateY));
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs
===================================================================
diff -u -r9cbac132235c0c6ede08eba6e975cfed5644b0bc -raffab28216d928fc119f636dca96f4b4d742e9c6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs)	(revision 9cbac132235c0c6ede08eba6e975cfed5644b0bc)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactoryTest.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
@@ -61,7 +61,7 @@
             ReadHydraulicLocationConfigurationDatabase database = ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(locationsIds);
 
             // Assert
-            Assert.AreEqual(3, database.LocationIdMappings.Count());
+            Assert.AreEqual(locationsIds.Length, database.LocationIdMappings.Count());
 
             var i = 0;
             foreach (ReadHydraulicLocationMapping databaseLocationIdMapping in database.LocationIdMappings)
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs
===================================================================
diff -u -re3b53bdd5eb61e237ac7375a26a335ef1d64e4c3 -raffab28216d928fc119f636dca96f4b4d742e9c6
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision e3b53bdd5eb61e237ac7375a26a335ef1d64e4c3)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs	(.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
@@ -52,7 +52,7 @@
         public static ReadHydraulicLocationConfigurationDatabase Create(IEnumerable<long> locationIds)
         {
             return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocationMapping(locationId, locationId + 100))
-                                                                             .ToList());
+                                                                             .ToArray());
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs
===================================================================
diff -u -re3b53bdd5eb61e237ac7375a26a335ef1d64e4c3 -raffab28216d928fc119f636dca96f4b4d742e9c6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision e3b53bdd5eb61e237ac7375a26a335ef1d64e4c3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
@@ -131,7 +131,7 @@
 
                 SetLocations(hydraulicBoundaryDatabase, readHydraulicBoundaryDatabase.Locations,
                              readHydraulicLocationConfigurationDatabase.LocationIdMappings,
-                             excludedLocationIds.ToList());
+                             excludedLocationIds.ToArray());
 
                 assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryDatabase.Locations);
                 assessmentSection.GrassCoverErosionOutwards.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryDatabase.Locations);
@@ -189,11 +189,11 @@
         }
 
         private static void SetLocations(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, IEnumerable<ReadHydraulicBoundaryLocation> readLocations,
-                                         IEnumerable<ReadHydraulicLocationMapping> locationIdMappings, List<long> excludedLocationIds)
+                                         IEnumerable<ReadHydraulicLocationMapping> locationIdMappings, long[] excludedLocationIds)
         {
             hydraulicBoundaryDatabase.Locations.Clear();
 
-            excludedLocationIds.Sort();
+            Array.Sort(excludedLocationIds);
 
             foreach (ReadHydraulicBoundaryLocation readLocation in readLocations)
             {
@@ -209,9 +209,9 @@
             }
         }
 
-        private static bool ShouldInclude(List<long> excludedLocationIds, long locationId)
+        private static bool ShouldInclude(long[] excludedLocationIds, long locationId)
         {
-            int matchingIndex = excludedLocationIds.BinarySearch(locationId);
+            int matchingIndex = Array.BinarySearch(excludedLocationIds, locationId);
             return matchingIndex < 0;
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -re3b53bdd5eb61e237ac7375a26a335ef1d64e4c3 -raffab28216d928fc119f636dca96f4b4d742e9c6
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision e3b53bdd5eb61e237ac7375a26a335ef1d64e4c3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
@@ -314,7 +314,7 @@
                        Assert.AreEqual(18, readHydraulicLocationConfigurationDatabase.LocationIdMappings.Count());
 
                        var excludedLocationIds = (IEnumerable<long>) invocation.Arguments[3];
-                       Assert.AreEqual(0, excludedLocationIds.Count());
+                       Assert.AreEqual(1, excludedLocationIds.Count());
                    })
                    .Return(Enumerable.Empty<IObservable>());
             mocks.ReplayAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/test-data/HydraulicBoundaryDatabaseImporter/complete.config.sqlite
===================================================================
diff -u -r7c60a75a8c4e1059ba6678277ea3249dd76f9788 -raffab28216d928fc119f636dca96f4b4d742e9c6
Binary files differ
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r0e31d46abbd9bf0565b8ca5f9c157aea26c8aacf -raffab28216d928fc119f636dca96f4b4d742e9c6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 0e31d46abbd9bf0565b8ca5f9c157aea26c8aacf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
@@ -30,7 +30,6 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.DuneErosion.Data.TestUtil;
 using Ringtoets.DuneErosion.Plugin.Handlers;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase;
@@ -547,9 +546,8 @@
                 new ReadHydraulicBoundaryLocation(3, "location 3", 3, 3),
                 new ReadHydraulicBoundaryLocation(4, "location 4", 4, 4)
             };
-            ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create(readHydraulicBoundaryLocationsToInclude
-                                                                                                                          .Concat(readHydraulicBoundaryLocationsToExclude)
-                                                                                                                          .ToList());
+            ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create(
+                readHydraulicBoundaryLocationsToInclude.Concat(readHydraulicBoundaryLocationsToExclude));
             ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = ReadHydraulicLocationConfigurationDatabaseTestFactory.Create();
 
             // Precondition
@@ -588,9 +586,10 @@
                 new ReadHydraulicBoundaryLocation(3, "location 3", 3, 3),
                 new ReadHydraulicBoundaryLocation(4, "location 4", 4, 4)
             };
-            ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create(readHydraulicBoundaryLocationsToExclude
-                                                                                                                          .Concat(readHydraulicBoundaryLocationsToInclude)
-                                                                                                                          .ToList());
+
+            ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create(
+                readHydraulicBoundaryLocationsToExclude.Concat(readHydraulicBoundaryLocationsToInclude));
+
             ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(
                 readHydraulicBoundaryLocationsToInclude.Select(l => l.Id));