Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r9413fea8dd78bd96c400377ab71f790102c9cbed
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 9413fea8dd78bd96c400377ab71f790102c9cbed)
@@ -564,7 +564,8 @@
             Assert.AreEqual(readHydraulicBoundaryDatabase.Version, hydraulicBoundaryDatabase.Version);
             Assert.AreEqual(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessorClosure, readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
 
-            AssertHydraulicBoundaryLocations(readHydraulicBoundaryDatabase.Locations, readHydraulicLocationConfigurationDatabase, hydraulicBoundaryDatabase.Locations);
+            AssertHydraulicBoundaryLocations(readHydraulicBoundaryDatabase.Locations, readHydraulicLocationConfigurationDatabase,
+                                             hydraulicBoundaryDatabase.Locations, readHydraulicBoundaryDatabase.TrackId);
             AssertHydraulicBoundaryLocationsAndCalculations(hydraulicBoundaryDatabase.Locations, assessmentSection);
             mocks.VerifyAll();
         }
@@ -606,7 +607,8 @@
                            Enumerable.Empty<long>(), hydraulicBoundaryDatabaseFilePath, hlcdFilePath);
 
             // Assert
-            AssertHydraulicBoundaryLocations(readHydraulicBoundaryLocationsToInclude, readHydraulicLocationConfigurationDatabase, hydraulicBoundaryDatabase.Locations);
+            AssertHydraulicBoundaryLocations(readHydraulicBoundaryLocationsToInclude, readHydraulicLocationConfigurationDatabase,
+                                             hydraulicBoundaryDatabase.Locations, readHydraulicBoundaryDatabase.TrackId);
             mocks.VerifyAll();
         }
 
@@ -650,7 +652,8 @@
                            readHydraulicBoundaryLocationsToExclude.Select(l => l.Id), hydraulicBoundaryDatabaseFilePath, hlcdFilePath);
 
             // Assert
-            AssertHydraulicBoundaryLocations(readHydraulicBoundaryLocationsToInclude, readHydraulicLocationConfigurationDatabase, hydraulicBoundaryDatabase.Locations);
+            AssertHydraulicBoundaryLocations(readHydraulicBoundaryLocationsToInclude, readHydraulicLocationConfigurationDatabase,
+                                             hydraulicBoundaryDatabase.Locations, readHydraulicBoundaryDatabase.TrackId);
             mocks.VerifyAll();
         }
 
@@ -971,7 +974,8 @@
 
         private static void AssertHydraulicBoundaryLocations(IEnumerable<ReadHydraulicBoundaryLocation> readLocations,
                                                              ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase,
-                                                             IEnumerable<HydraulicBoundaryLocation> actualLocations)
+                                                             IEnumerable<HydraulicBoundaryLocation> actualLocations,
+                                                             long trackId)
         {
             Assert.AreEqual(readLocations.Count(), actualLocations.Count());
 
@@ -980,9 +984,10 @@
                 ReadHydraulicBoundaryLocation readLocation = readLocations.ElementAt(i);
                 HydraulicBoundaryLocation actualLocation = actualLocations.ElementAt(i);
 
-                Assert.AreEqual(readHydraulicLocationConfigurationDatabase.LocationIdMappings
-                                                                          .Single(l => l.HrdLocationId == readLocation.Id)
-                                                                          .HlcdLocationId, actualLocation.Id);
+                Assert.AreEqual(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations
+                                                                          .Where(rhl => rhl.TrackId == trackId)
+                                                                          .Single(l => l.HrdLocationId == readLocation.Id).HlcdLocationId,
+                                actualLocation.Id);
                 Assert.AreEqual(readLocation.Name, actualLocation.Name);
                 Assert.AreEqual(readLocation.CoordinateX, actualLocation.Location.X);
                 Assert.AreEqual(readLocation.CoordinateY, actualLocation.Location.Y);