Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -re1eca7dab59f9465ca9d0bd6d705490528a5e5a8 -r2e855cfd58cca717db843b13e1e24f1fc9c4f451
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision e1eca7dab59f9465ca9d0bd6d705490528a5e5a8)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
@@ -18,7 +18,7 @@
 namespace Core.Common.Controls.Swf.Test.TreeViewControls
 {
     [TestFixture]
-    public class TreeViewTest : WindowsFormsTestBase
+    public class TreeViewTest : NUnitFormTest
     {
         private readonly MockRepository mockRepository = new MockRepository();
 
@@ -323,7 +323,13 @@
         [Test]
         public void DeletedNodeMovesSelectionToItsParentNode()
         {
-            ExpectModal("Bevestigen", "MessageBoxHandler");
+            DialogBoxHandler = (name, wnd) =>
+            {
+                var messageBox = new MessageBoxTester(wnd);
+                Assert.AreEqual("Weet u zeker dat u het volgende item wilt verwijderen: GrandChild", messageBox.Text);
+                Assert.AreEqual("Bevestigen", messageBox.Title);
+                messageBox.ClickOk();
+            };
 
             using (var treeView = new TreeView())
             {
@@ -546,10 +552,5 @@
                 isLoaded = value;
             }
         }
-
-        public void MessageBoxHandler()
-        {
-            new MessageBoxTester("Bevestigen").ClickOk();
-        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiImportHandlerTest.cs
===================================================================
diff -u -r482a3c997bd68b3b524639518cb488335caf02e8 -r2e855cfd58cca717db843b13e1e24f1fc9c4f451
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision 482a3c997bd68b3b524639518cb488335caf02e8)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
@@ -1,15 +1,14 @@
 using System;
 using Core.Common.Base.Plugin;
 using Core.Common.Gui;
-using Core.Common.TestUtils;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 
 namespace Core.Common.Integration.Test.Ringtoets.Application.Ringtoets
 {
     [TestFixture]
-    public class GuiImportHandlerTest : WindowsFormsTestBase
+    public class GuiImportHandlerTest : NUnitFormTest
     {
         private MockRepository mocks;
         private IGui gui;
@@ -29,18 +28,19 @@
 
             mocks.ReplayAll();
 
-            ExpectModal("Fout", "MessageBoxHandler");
+            DialogBoxHandler = (name, wnd) =>
+            {
+                var messageBox = new MessageBoxTester(wnd);
+                Assert.AreEqual("Geen enkele 'Importer' is beschikbaar voor dit 'item'.", messageBox.Text);
+                Assert.AreEqual("Fout", messageBox.Title);
+                messageBox.ClickOk();
+            };
 
             var importHandler = new GuiImportHandler(gui);
 
             var item = importHandler.GetSupportedImporterForTargetType(typeof(Int64));
 
             Assert.IsNull(item);
         }
-
-        public void MessageBoxHandler()
-        {
-            new MessageBoxTester("Fout").ClickOk();
-        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj
===================================================================
diff -u -r482a3c997bd68b3b524639518cb488335caf02e8 -r2e855cfd58cca717db843b13e1e24f1fc9c4f451
--- Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj	(.../Core.Common.TestUtils.csproj)	(revision 482a3c997bd68b3b524639518cb488335caf02e8)
+++ Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj	(.../Core.Common.TestUtils.csproj)	(revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
@@ -74,9 +74,6 @@
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NUnitForms">
-      <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
@@ -107,7 +104,6 @@
     </Compile>
     <Compile Include="TestDataPath.cs" />
     <Compile Include="TestHelper.cs" />
-    <Compile Include="WindowsFormsTestBase.cs" />
     <Compile Include="WindowsFormsTestHelper.cs">
       <SubType>Form</SubType>
     </Compile>
Fisheye: Tag 2e855cfd58cca717db843b13e1e24f1fc9c4f451 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/WindowsFormsTestBase.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -r482a3c997bd68b3b524639518cb488335caf02e8 -r2e855cfd58cca717db843b13e1e24f1fc9c4f451
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 482a3c997bd68b3b524639518cb488335caf02e8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 2e855cfd58cca717db843b13e1e24f1fc9c4f451)
@@ -1,7 +1,6 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Controls.Swf;
 using Core.Common.TestUtils;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -12,7 +11,7 @@
 namespace Ringtoets.Integration.Forms.Test.Views
 {
     [TestFixture]
-    public class FailureMechanismContributionViewTest : WindowsFormsTestBase
+    public class FailureMechanismContributionViewTest : NUnitFormTest
     {
         private MockRepository mockRepository;