Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r1f1993456901354dd2eba30de8469139157f8bd0
--- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 1f1993456901354dd2eba30de8469139157f8bd0)
@@ -204,31 +204,25 @@
         [Test]
         public void GetTestDataPath_Always_VerifiedTestPaths()
         {
-            string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core);
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Util);
             Assert.IsTrue(Directory.Exists(path));
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Storage.Core);
+            path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.IO);
             Assert.IsTrue(Directory.Exists(path));
+            
+            path = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO);
+            Assert.IsTrue(Directory.Exists(path));
 
-            path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Util);
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.AssemblyTool.IO);
             Assert.IsTrue(Directory.Exists(path));
-            path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.IO);
+
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.ClosingStructures.IO);
             Assert.IsTrue(Directory.Exists(path));
 
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO);
             Assert.IsTrue(Directory.Exists(path));
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.Service);
             Assert.IsTrue(Directory.Exists(path));
 
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO);
-            Assert.IsTrue(Directory.Exists(path));
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.Calculation);
-            Assert.IsTrue(Directory.Exists(path));
-
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms);
-            Assert.IsTrue(Directory.Exists(path));
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service);
-            Assert.IsTrue(Directory.Exists(path));
-
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO);
             Assert.IsTrue(Directory.Exists(path));
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.Integration);
@@ -242,20 +236,39 @@
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HeightStructures.Integration);
             Assert.IsTrue(Directory.Exists(path));
 
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.ClosingStructures.IO);
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO);
             Assert.IsTrue(Directory.Exists(path));
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.Calculation);
+            Assert.IsTrue(Directory.Exists(path));
 
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.StabilityPointStructures.IO);
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms);
             Assert.IsTrue(Directory.Exists(path));
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service);
+            Assert.IsTrue(Directory.Exists(path));
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.IO);
+            Assert.IsTrue(Directory.Exists(path));
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin);
+            Assert.IsTrue(Directory.Exists(path));
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.TestUtil);
+            Assert.IsTrue(Directory.Exists(path));
 
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO);
+            Assert.IsTrue(Directory.Exists(path));
+
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Migration.Core);
+            Assert.IsTrue(Directory.Exists(path));
+
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO);
             Assert.IsTrue(Directory.Exists(path));
 
             path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO);
             Assert.IsTrue(Directory.Exists(path));
 
-            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.AssemblyTool.IO);
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.StabilityPointStructures.IO);
             Assert.IsTrue(Directory.Exists(path));
+
+            path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Storage.Core);
+            Assert.IsTrue(Directory.Exists(path));
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/HydraulicBoundaryDatabase/empty.sqlite
===================================================================
diff -u -rbe5dbe42ae9ae13e81fb7cb71467f71cc62e5d43 -r1f1993456901354dd2eba30de8469139157f8bd0
Binary files differ
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rfdc1c1548d509bc02474ebedbf4e2dfd93e4e354 -r1f1993456901354dd2eba30de8469139157f8bd0
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision fdc1c1548d509bc02474ebedbf4e2dfd93e4e354)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 1f1993456901354dd2eba30de8469139157f8bd0)
@@ -772,9 +772,9 @@
                 FileFilterGenerator = new FileFilterGenerator(Resources.HydraulicBoundaryDatabase_FilePath_Extension,
                                                               Resources.HydraulicBoundaryDatabase_file_filter_Description),
                 CreateFileImporter = (context, filePath) => new HydraulicBoundaryDatabaseImporter(
-                    context.WrappedData, new HydraulicBoundaryDatabaseUpdateHandler(
-                        context.AssessmentSection, new DuneLocationsReplacementHandler(
-                            Gui.ViewCommands, context.AssessmentSection.DuneErosion)),
+                    context.WrappedData, new HydraulicBoundaryDatabaseUpdateHandler(context.AssessmentSection,
+                                                                                    new DuneLocationsReplacementHandler(
+                                                                                        Gui.ViewCommands, context.AssessmentSection.DuneErosion)),
                     filePath)
             };
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -raffab28216d928fc119f636dca96f4b4d742e9c6 -r1f1993456901354dd2eba30de8469139157f8bd0
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision affab28216d928fc119f636dca96f4b4d742e9c6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 1f1993456901354dd2eba30de8469139157f8bd0)
@@ -833,8 +833,8 @@
                 HydraulicBoundaryLocation actualLocation = actualLocations.ElementAt(i);
 
                 Assert.AreEqual(readHydraulicLocationConfigurationDatabase.LocationIdMappings
-                                                                          .Where(l => l.HrdLocationId == readLocation.Id)
-                                                                          .Select(l => l.HlcdLocationId).Single(), actualLocation.Id);
+                                                                          .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);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8a8c46f2252d1bd75c22e3ae67b9664c4a28d7d0 -r1f1993456901354dd2eba30de8469139157f8bd0
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 8a8c46f2252d1bd75c22e3ae67b9664c4a28d7d0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 1f1993456901354dd2eba30de8469139157f8bd0)
@@ -214,10 +214,9 @@
                     // Call
                     using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, assessmentSection, treeViewControl))
                     {
-                        const string expectedItemText = "&Koppel aan database...";
-                        const string expectedItemTooltip = "Koppel aan hydraulische belastingendatabase.";
                         TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuImportHydraulicBoundaryDatabaseIndex,
-                                                                      expectedItemText, expectedItemTooltip,
+                                                                      "&Koppel aan database...",
+                                                                      "Koppel aan hydraulische belastingendatabase.",
                                                                       RingtoetsCommonFormsResources.DatabaseIcon);
                     }
                 }
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/DataImportHelper.cs
===================================================================
diff -u -r63520df04e8830481e16d35b466f99a4f2276406 -r1f1993456901354dd2eba30de8469139157f8bd0
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/DataImportHelper.cs	(.../DataImportHelper.cs)	(revision 63520df04e8830481e16d35b466f99a4f2276406)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/DataImportHelper.cs	(.../DataImportHelper.cs)	(revision 1f1993456901354dd2eba30de8469139157f8bd0)
@@ -184,7 +184,8 @@
         /// </summary>
         /// <param name="assessmentSection">The <see cref="AssessmentSection"/> to import on.</param>
         /// <param name="filePath">The filePath to import from.</param>
-        /// <remarks>This will import 18 Hydraulic boundary locations.</remarks>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="assessmentSection"/>
+        /// is <c>null</c>.</exception>
         public static void ImportHydraulicBoundaryDatabase(AssessmentSection assessmentSection, string filePath)
         {
             if (assessmentSection == null)