Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs
===================================================================
diff -u -r8476d48f3aa0d36c866433c29be238aa52abcfe4 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs	(.../HydraulicDatabaseHelper.cs)	(revision 8476d48f3aa0d36c866433c29be238aa52abcfe4)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs	(.../HydraulicDatabaseHelper.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -1,13 +1,15 @@
 using System;
 using System.IO;
 using Core.Common.IO.Exceptions;
-using log4net;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabaseContext;
 using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabaseContext;
 
 namespace Ringtoets.HydraRing.IO
 {
+    /// <summary>
+    /// This class defines helper methods for obtaining meta data from hyraulic boundary databases.
+    /// </summary>
     public static class HydraulicDatabaseHelper
     {
         /// <summary>
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicDatabaseHelperTest.cs
===================================================================
diff -u -r8476d48f3aa0d36c866433c29be238aa52abcfe4 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicDatabaseHelperTest.cs	(.../HydraulicDatabaseHelperTest.cs)	(revision 8476d48f3aa0d36c866433c29be238aa52abcfe4)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicDatabaseHelperTest.cs	(.../HydraulicDatabaseHelperTest.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -13,7 +13,7 @@
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO, "HydraulicBoundaryLocationReader");
 
         [Test]
-        public void ValidateAndConnectTo_ExistingFileWithHlcd_ReturnsTrue()
+        public void ValidatePathForCalculation_ExistingFileWithHlcd_ReturnsNull()
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
@@ -26,7 +26,7 @@
         }
 
         [Test]
-        public void ValidateAndConnectTo_NonExistingFile_ReturnsFalse()
+        public void ValidatePathForCalculation_NonExistingFile_ReturnsMessageWithError()
         {
             // Setup
             var nonexistingSqlite = "nonexisting.sqlite";
@@ -40,7 +40,7 @@
         }
 
         [Test]
-        public void ValidateAndConnectTo_InvalidFile_ReturnsFalse()
+        public void ValidatePathForCalculation_InvalidFile_ReturnsMessageWithError()
         {
             // Setup
             var invalidPath = Path.Combine(testDataPath, "complete.sqlite");
@@ -54,7 +54,7 @@
         }
 
         [Test]
-        public void ValidateAndConnectTo_FileIsDirectory_ReturnsFalse()
+        public void ValidatePathForCalculation_FileIsDirectory_ReturnsMessageWithError()
         {
             // Setup
             string filePath = Path.Combine(testDataPath, "/");
@@ -67,7 +67,7 @@
         }
 
         [Test]
-        public void ValidateAndConnectTo_ExistingFileWithoutHlcd_ReturnsFalse()
+        public void ValidatePathForCalculation_ExistingFileWithoutHlcd_ReturnsMessageWithError()
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, "withoutHLCD", "empty.sqlite");
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs
===================================================================
diff -u -rfc38d18fc6ff1749476da0ea43281d5d80568283 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs	(.../HydraulicBoundaryDatabaseContext.cs)	(revision fc38d18fc6ff1749476da0ea43281d5d80568283)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs	(.../HydraulicBoundaryDatabaseContext.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -22,8 +22,6 @@
 using System;
 
 using Core.Common.Base;
-
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HydraRing.Data;
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r2cf2214c4069c98c3cb21708729fcbc2ca964ab6 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2cf2214c4069c98c3cb21708729fcbc2ca964ab6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -199,7 +199,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kon geen berekeningen starten. {0}.
+        ///   Looks up a localized string similar to Berekeningen konden niet worden gestart. {0}.
         /// </summary>
         public static string RingtoetsGuiPlugin_HydraulicBoundaryDatabaseContextMenuStrip_Start_calculation_failed_0_ {
             get {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r2cf2214c4069c98c3cb21708729fcbc2ca964ab6 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 2cf2214c4069c98c3cb21708729fcbc2ca964ab6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -167,6 +167,6 @@
     <value>Herstellen van de connectie naar de hydraulische randvoorwaarden database mislukt. {0}</value>
   </data>
   <data name="RingtoetsGuiPlugin_HydraulicBoundaryDatabaseContextMenuStrip_Start_calculation_failed_0_" xml:space="preserve">
-    <value>Kon geen berekeningen starten. {0}</value>
+    <value>Berekeningen konden niet worden gestart. {0}</value>
   </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2cf2214c4069c98c3cb21708729fcbc2ca964ab6 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 2cf2214c4069c98c3cb21708729fcbc2ca964ab6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -268,7 +268,7 @@
                 Action action = () => { contextMenuAdapter.Items[contextMenuRunAssessmentLevelCalculationsIndex].PerformClick(); };
 
                 // Then
-                string message = string.Format("Kon geen berekeningen starten. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.",
+                string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.",
                     hydraulicBoundaryDatabase.FilePath);
                 TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple<string, LogLevelConstant>(message, LogLevelConstant.Error));
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r8476d48f3aa0d36c866433c29be238aa52abcfe4 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 8476d48f3aa0d36c866433c29be238aa52abcfe4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -62,6 +62,7 @@
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryDatabaseImporter>(importer);
+            Assert.IsInstanceOf<IDisposable>(importer);
         }
 
         [Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r2cf2214c4069c98c3cb21708729fcbc2ca964ab6 -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 2cf2214c4069c98c3cb21708729fcbc2ca964ab6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
@@ -41,7 +41,7 @@
             using (var ringtoetsGuiPlugin = new RingtoetsGuiPlugin())
             {
                 // Assert
-                Assert.IsInstanceOf<Core.Common.Gui.Plugin.GuiPlugin>(ringtoetsGuiPlugin);
+                Assert.IsInstanceOf<GuiPlugin>(ringtoetsGuiPlugin);
                 Assert.IsInstanceOf<RingtoetsRibbon>(ringtoetsGuiPlugin.RibbonCommandHandler);
             }
         }