Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r272e04aaa5c3a85dce612a0a87c394b9767b3f64
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision 272e04aaa5c3a85dce612a0a87c394b9767b3f64)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Data.SQLite;
 using System.IO;
 using System.Linq;
@@ -46,13 +45,13 @@
             string dbFile = Path.Combine(testDataPath, "none.sqlite");
 
             // Call
-            TestDelegate test = () =>
+            void Call()
             {
                 using (new HydraulicLocationConfigurationDatabaseReader(dbFile)) {}
-            };
+            }
 
             // Assert
-            var exception = Assert.Throws<CriticalFileReadException>(test);
+            var exception = Assert.Throws<CriticalFileReadException>(Call);
             string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bestand bestaat niet.");
             Assert.AreEqual(expectedMessage, exception.Message);
         }
@@ -113,9 +112,10 @@
                                                                                   .SingleOrDefault();
                 Assert.AreEqual(expectedLocationId, actualLocationId);
                 Assert.IsFalse(readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
-                IEnumerable<ReadHydraulicLocationConfigurationDatabaseSettings> readHydraulicLocationConfigurationDatabaseSettings =
-                    readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings;
-                Assert.AreEqual(2, readHydraulicLocationConfigurationDatabaseSettings.Count());
+                ReadHydraulicLocationConfigurationDatabaseSettings[] readHydraulicLocationConfigurationDatabaseSettings =
+                    readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.ToArray();
+                
+                Assert.AreEqual(2, readHydraulicLocationConfigurationDatabaseSettings.Length);
 
                 CollectionAssert.AreEqual(new[]
                 {
@@ -190,11 +190,11 @@
             using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
             {
                 // Call
-                TestDelegate test = () => hydraulicBoundaryDatabaseReader.Read(1000);
+                void Call() => hydraulicBoundaryDatabaseReader.Read(1000);
 
                 // Assert
                 string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
-                var exception = Assert.Throws<LineParseException>(test);
+                var exception = Assert.Throws<LineParseException>(Call);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<InvalidCastException>(exception.InnerException);
             }
@@ -210,11 +210,11 @@
             using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
             {
                 // Call
-                TestDelegate test = () => hydraulicBoundaryDatabaseReader.Read(trackId);
+                void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
 
                 // Assert
                 string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt.");
-                var exception = Assert.Throws<CriticalFileReadException>(test);
+                var exception = Assert.Throws<CriticalFileReadException>(Call);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<SQLiteException>(exception.InnerException);
             }
@@ -230,42 +230,17 @@
             using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
             {
                 // Call
-                TestDelegate test = () => hydraulicBoundaryDatabaseReader.Read(trackId);
+                void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
 
                 // Assert
                 string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
-                var exception = Assert.Throws<LineParseException>(test);
+                var exception = Assert.Throws<LineParseException>(Call);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<ConversionException>(exception.InnerException);
             }
         }
 
         [Test]
-        public void Read_AmbiguousLocations_ReturnsFirstLocationIdAndLogsWarning()
-        {
-            // Setup
-            string dbFile = Path.Combine(testDataPath, "ambigousLocation.sqlite");
-            const int trackId = 11;
-            const int hrdLocationId = 1;
-            ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = null;
-
-            using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
-            {
-                // Call
-                Action call = () => readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(trackId);
-
-                // Assert
-                const int expectedLocationId = 1800001;
-                const string expectedMessage = "Er zijn meerdere resultaten gevonden, wat niet voor zou mogen komen. Neem contact op met de leverancier. Het eerste resultaat zal worden gebruikt.";
-                TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
-                long actualLocationId = readHydraulicLocationConfigurationDatabase.LocationIdMappings.Where(m => m.HrdLocationId == hrdLocationId)
-                                                                                  .Select(m => m.HlcdLocationId)
-                                                                                  .Single();
-                Assert.AreEqual(expectedLocationId, actualLocationId);
-            }
-        }
-
-        [Test]
         public void Read_InvalidColumns_ThrowsLineParseException()
         {
             // Setup
@@ -275,11 +250,11 @@
             using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
             {
                 // Call
-                TestDelegate test = () => hydraulicBoundaryDatabaseReader.Read(trackId);
+                void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
 
                 // Assert
                 string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
-                var exception = Assert.Throws<LineParseException>(test);
+                var exception = Assert.Throws<LineParseException>(Call);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<InvalidCastException>(exception.InnerException);
             }
@@ -295,11 +270,11 @@
             using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
             {
                 // Call
-                TestDelegate test = () => hydraulicBoundaryDatabaseReader.Read(trackId);
+                void Call() => hydraulicBoundaryDatabaseReader.Read(trackId);
 
                 // Assert
                 string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt.");
-                var exception = Assert.Throws<CriticalFileReadException>(test);
+                var exception = Assert.Throws<CriticalFileReadException>(Call);
                 Assert.AreEqual(expectedMessage, exception.Message);
                 Assert.IsInstanceOf<SQLiteException>(exception.InnerException);
             }
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HydraulicLocationConfigurationDatabase/ambigousLocation.sqlite
===================================================================
diff -u -r214992131e8f6b96f2504c706bc340247e77a813 -r272e04aaa5c3a85dce612a0a87c394b9767b3f64
Binary files differ