Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r73c7ad038a082c5a7476dd826ce789bad601141a -r441e39238be8432a9596edcbb1b6aa650e30b9a6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 73c7ad038a082c5a7476dd826ce789bad601141a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 441e39238be8432a9596edcbb1b6aa650e30b9a6)
@@ -420,5 +420,4 @@
   <ItemGroup>
     <None Include="Resources\AddFolder-stand32.png" />
   </ItemGroup>
-  <ItemGroup />
 </Project>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r968ff30159efb3fbf0a698100bfcf6aaff83fa7e -r441e39238be8432a9596edcbb1b6aa650e30b9a6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 968ff30159efb3fbf0a698100bfcf6aaff83fa7e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 441e39238be8432a9596edcbb1b6aa650e30b9a6)
@@ -303,9 +303,11 @@
             };
             yield return new PropertyInfo<HydraulicBoundaryDatabaseContext, HydraulicBoundaryDatabaseProperties>
             {
-                CreateInstance = context => new HydraulicBoundaryDatabaseProperties(context.WrappedData,
-                                                                                    new HydraulicLocationConfigurationDatabaseImportHandler(Gui.MainWindow,
-                                                                                                                                            new HydraulicLocationConfigurationDatabaseUpdateHandler(context.AssessmentSection)))
+                CreateInstance = context => new HydraulicBoundaryDatabaseProperties(
+                    context.WrappedData,
+                    new HydraulicLocationConfigurationDatabaseImportHandler(
+                        Gui.MainWindow,
+                        new HydraulicLocationConfigurationDatabaseUpdateHandler(context.AssessmentSection)))
             };
             yield return new PropertyInfo<FailureMechanismContributionContext, AssessmentSectionCompositionProperties>
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs
===================================================================
diff -u -r9326aefe9d4eac9e4bf8f25858386e9e70d2a5d0 -r441e39238be8432a9596edcbb1b6aa650e30b9a6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseImportHandlerTest.cs)	(revision 9326aefe9d4eac9e4bf8f25858386e9e70d2a5d0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseImportHandlerTest.cs)	(revision 441e39238be8432a9596edcbb1b6aa650e30b9a6)
@@ -20,15 +20,14 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using Core.Common.TestUtil;
+using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Forms.PropertyClasses;
 using Ringtoets.Integration.IO.Handlers;
@@ -38,7 +37,7 @@
 namespace Ringtoets.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class HydraulicLocationConfigurationDatabaseImportHandlerTest
+    public class HydraulicLocationConfigurationDatabaseImportHandlerTest : NUnitFormTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin);
         private static readonly string testDataDirectory = Path.Combine(testDataPath, nameof(HydraulicLocationConfigurationDatabaseImportHandler));
@@ -135,7 +134,7 @@
         }
 
         [Test]
-        public void ImportHydraulicLocationConfigurationSettings_WithValidFilePath_SetsHydraulicLocationConfigurationDatabaseSettings()
+        public void ImportHydraulicLocationConfigurationSettings_WithValidFilePath_RunsActivity()
         {
             // Setup
             string newHlcdFilePath = Path.Combine(testDataDirectory, "hlcdWithScenarioInformation.sqlite");
@@ -148,17 +147,14 @@
 
             var mocks = new MockRepository();
             var viewParent = mocks.Stub<IWin32Window>();
-            var updateHandler = mocks.StrictMock<IHydraulicLocationConfigurationDatabaseUpdateHandler>();
-            updateHandler.Expect(uh => uh.InquireConfirmation()).Return(true);
-            updateHandler.Expect(uh => uh.Update(Arg<HydraulicBoundaryDatabase>.Is.Same(hydraulicBoundaryDatabase),
-                                                 Arg<ReadHydraulicLocationConfigurationDatabaseSettings>.Is.NotNull,
-                                                 Arg<string>.Is.Equal(newHlcdFilePath)))
-                         .WhenCalled(invoke =>
-                         {
-                             Assert.AreEqual(1, (IEnumerable<ReadHydraulicLocationConfigurationDatabaseSettings>) invoke.Arguments[1]);
-                         });
+            var updateHandler = mocks.Stub<IHydraulicLocationConfigurationDatabaseUpdateHandler>();
             mocks.ReplayAll();
 
+            DialogBoxHandler = (name, wnd) =>
+            {
+                // Activity closes itself
+            };
+
             var importHandler = new HydraulicLocationConfigurationDatabaseImportHandler(viewParent, updateHandler);
 
             // Call