Index: Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs	(.../DialogBaseTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Controls.Test/Dialogs/DialogBaseTest.cs	(.../DialogBaseTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -31,7 +31,7 @@
 namespace Core.Common.Controls.Test.Dialogs
 {
     [TestFixture]
-    public class DialogBaseTest : NUnitFormTestWithHiddenDesktop
+    public class DialogBaseTest : NUnitFormTest
     {
         [Test]
         public void Constructor_OwnerEqualsNull_ArgumentNullExceptionIsThrown()
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs	(.../TreeViewControlTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs	(.../TreeViewControlTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -34,7 +34,7 @@
 namespace Core.Common.Controls.TreeView.Test
 {
     [TestFixture]
-    public class TreeViewControlTest : NUnitFormTestWithHiddenDesktop
+    public class TreeViewControlTest : NUnitFormTest
     {
         [Test]
         public void DefaultConstructor_InitializedTreeViewControl()
Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs	(.../GuiExportHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs	(.../GuiExportHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -41,7 +41,7 @@
 namespace Core.Common.Gui.Test.Commands
 {
     [TestFixture]
-    public class GuiExportHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class GuiExportHandlerTest : NUnitFormTest
     {
         [Test]
         [TestCase(1234)]
Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs	(.../GuiImportHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -35,7 +35,7 @@
 namespace Core.Common.Gui.Test.Commands
 {
     [TestFixture]
-    public class GuiImportHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class GuiImportHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_WithoutDialogParent_ThrowsArgumentNullException()
Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs	(.../GuiUpdateHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs	(.../GuiUpdateHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -35,7 +35,7 @@
 namespace Core.Common.Gui.Test.Commands
 {
     [TestFixture]
-    public class GuiUpdateHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class GuiUpdateHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_WithoutDialogParent_ThrowsArgumentNullException()
Index: Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -36,7 +36,7 @@
 namespace Core.Common.Gui.Test.Commands
 {
     [TestFixture]
-    public class StorageCommandHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class StorageCommandHandlerTest : NUnitFormTest
     {
         private MockRepository mocks;
 
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -32,7 +32,7 @@
 namespace Core.Common.Gui.Test.ContextMenu
 {
     [TestFixture]
-    public class TreeViewContextMenuItemFactoryTest : NUnitFormTestWithHiddenDesktop
+    public class TreeViewContextMenuItemFactoryTest : NUnitFormTest
     {
         private MockRepository mocks;
 
Index: Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs	(.../DialogBasedInquiryHelperTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/DialogBasedInquiryHelperTest.cs	(.../DialogBasedInquiryHelperTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -31,7 +31,7 @@
 namespace Core.Common.Gui.Test
 {
     [TestFixture]
-    public class DialogBasedInquiryHelperTest : NUnitFormTestWithHiddenDesktop
+    public class DialogBasedInquiryHelperTest : NUnitFormTest
     {
         private IWin32Window dialogParent;
         private MockRepository mocks;
Index: Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,15 +23,14 @@
 using System.Threading;
 using System.Windows.Forms;
 using Core.Common.Gui.Commands;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 
 namespace Core.Common.Gui.Test
 {
     [TestFixture]
-    public class ExceptionDialogTest : NUnitFormTestWithHiddenDesktop
+    public class ExceptionDialogTest : NUnitFormTest
     {
         [Test]
         public void DefaultConstructor_ExpectedValue()
Index: Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,7 +23,6 @@
 using System.Data;
 using System.Threading;
 using System.Windows.Forms;
-using Core.Common.TestUtil;
 using log4net.Core;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -33,7 +32,7 @@
 namespace Core.Common.Gui.Test.Forms.MessageWindow
 {
     [TestFixture]
-    public class MessageWindowTest : NUnitFormTestWithHiddenDesktop
+    public class MessageWindowTest : NUnitFormTest
     {
         private GuiFormsMessageWindow.MessageWindowLogAppender originalValue;
 
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ProgressDialog/ActivityProgressDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Forms/ProgressDialog/ActivityProgressDialogTest.cs	(.../ActivityProgressDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ProgressDialog/ActivityProgressDialogTest.cs	(.../ActivityProgressDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -24,15 +24,14 @@
 using Core.Common.Base.Service;
 using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Forms.ProgressDialog;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 
 namespace Core.Common.Gui.Test.Forms.ProgressDialog
 {
     [TestFixture]
-    public class ActivityProgressDialogTest : NUnitFormTestWithHiddenDesktop
+    public class ActivityProgressDialogTest : NUnitFormTest
     {
         [Test]
         public void DefaultConstructor_ExpectedValue()
Index: Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs	(.../SelectItemDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs	(.../SelectItemDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -24,15 +24,14 @@
 using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Test.Properties;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 
 namespace Core.Common.Gui.Test.Forms
 {
     [TestFixture]
-    public class SelectItemDialogTest : NUnitFormTestWithHiddenDesktop
+    public class SelectItemDialogTest : NUnitFormTest
     {
         [Test]
         public void Constructor_WithoutDialogParent_ThrowsArgumentNullException()
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs	(.../DocumentViewControllerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs	(.../DocumentViewControllerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -25,15 +25,14 @@
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms.ViewHost;
 using Core.Common.Gui.Plugin;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 
 namespace Core.Common.Gui.Test.Forms.ViewHost
 {
     [TestFixture]
-    public class DocumentViewControllerTest : NUnitFormTestWithHiddenDesktop
+    public class DocumentViewControllerTest : NUnitFormTest
     {
         [Test]
         public void ParameteredConstructor_ExpectedValues()
Index: Core/Common/test/Core.Common.Gui.Test/UITypeEditors/ColorEditorTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.Gui.Test/UITypeEditors/ColorEditorTest.cs	(.../ColorEditorTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.Gui.Test/UITypeEditors/ColorEditorTest.cs	(.../ColorEditorTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -21,14 +21,13 @@
 
 using System.Drawing.Design;
 using Core.Common.Gui.UITypeEditors;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 
 namespace Core.Common.Gui.Test.UITypeEditors
 {
     [TestFixture]
-    public class ColorEditorTest : NUnitFormTestWithHiddenDesktop
+    public class ColorEditorTest : NUnitFormTest
     {
         [Test]
         public void DefaultConstructor_ReturnsNewInstance()
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -45,7 +45,6 @@
     <Compile Include="InvalidPathHelper.cs" />
     <Compile Include="LogHelper.cs" />
     <Compile Include="LogLevelConstant.cs" />
-    <Compile Include="NUnitFormTestWithHiddenDesktop.cs" />
     <Compile Include="PropertiesTestHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Fisheye: Tag 56d072b8342f3e54ba89124ab918bd1529e257a3 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil/NUnitFormTestWithHiddenDesktop.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsConnectionDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsConnectionDialogTest.cs	(.../WmtsConnectionDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsConnectionDialogTest.cs	(.../WmtsConnectionDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,7 +23,6 @@
 using System.Threading;
 using System.Windows.Forms;
 using Core.Common.Controls.Dialogs;
-using Core.Common.TestUtil;
 using Core.Components.Gis.Forms.Views;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -32,7 +31,7 @@
 namespace Core.Components.Gis.Forms.Test.Views
 {
     [TestFixture]
-    public class WmtsConnectionDialogTest : NUnitFormTestWithHiddenDesktop
+    public class WmtsConnectionDialogTest : NUnitFormTest
     {
         [Test]
         public void Constructor_WithoutDialogParent_ThrowsArgumentNullException()
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -44,7 +44,7 @@
 namespace Core.Components.Gis.Forms.Test.Views
 {
     [TestFixture]
-    public class WmtsLocationControlTest : NUnitFormTestWithHiddenDesktop
+    public class WmtsLocationControlTest : NUnitFormTest
     {
         private const int mapLayerIdColumnIndex = 0;
         private const int mapLayerFormatColumnIndex = 1;
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs	(.../MapDataCollectionContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs	(.../MapDataCollectionContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -47,7 +47,7 @@
 namespace Core.Plugins.Map.Test.Legend
 {
     [TestFixture]
-    public class MapDataCollectionContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MapDataCollectionContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuAddMapLayerIndex = 0;
         private const int contextMenuZoomToAllIndex = 2;
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs	(.../ProjectExplorerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs	(.../ProjectExplorerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -37,7 +37,7 @@
 namespace Core.Plugins.ProjectExplorer.Test
 {
     [TestFixture]
-    public class ProjectExplorerTest : NUnitFormTestWithHiddenDesktop
+    public class ProjectExplorerTest : NUnitFormTest
     {
         [Test]
         [TestCase(0)]
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs	(.../ClosingStructuresContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs	(.../ClosingStructuresContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.ClosingStructures.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class ClosingStructuresContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ClosingStructuresContextImportInfoTest : NUnitFormTest
     {
         [Test]
         public void Name_Always_ReturnExpectedName()
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.ClosingStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class ClosingStructuresCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ClosingStructuresCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateForeshoreProfileIndex = 5;
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -57,7 +57,7 @@
 namespace Riskeer.ClosingStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class ClosingStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ClosingStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuGenerateCalculationsIndexRootGroup = 3;
         private const int contextMenuAddCalculationGroupIndexRootGroup = 5;
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -58,7 +58,7 @@
 namespace Riskeer.ClosingStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class ClosingStructuresFailureMechanismContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ClosingStructuresFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/UpdateInfos/ClosingStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/UpdateInfos/ClosingStructuresContextUpdateInfoTest.cs	(.../ClosingStructuresContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/UpdateInfos/ClosingStructuresContextUpdateInfoTest.cs	(.../ClosingStructuresContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -42,7 +42,7 @@
 namespace Riskeer.ClosingStructures.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class ClosingStructuresContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ClosingStructuresContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private ClosingStructuresPlugin plugin;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs	(.../FailureMechanismPropertyChangeHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs	(.../FailureMechanismPropertyChangeHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -24,7 +24,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Riskeer.Common.Data.Calculation;
@@ -36,7 +35,7 @@
 namespace Riskeer.Common.Forms.Test.ChangeHandlers
 {
     [TestFixture]
-    public class FailureMechanismPropertyChangeHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class FailureMechanismPropertyChangeHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_Expectedvalues()
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ObservablePropertyChangeHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ObservablePropertyChangeHandlerTest.cs	(.../ObservablePropertyChangeHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ObservablePropertyChangeHandlerTest.cs	(.../ObservablePropertyChangeHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,7 +23,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using Core.Common.Base;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Riskeer.Common.Data.Calculation;
@@ -35,7 +34,7 @@
 namespace Riskeer.Common.Forms.Test.ChangeHandlers
 {
     [TestFixture]
-    public class ObservablePropertyChangeHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class ObservablePropertyChangeHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_WithCalculation_Expectedvalues()
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -39,7 +39,7 @@
 namespace Riskeer.Common.Forms.Test.GuiServices
 {
     [TestFixture]
-    public class HydraulicBoundaryLocationCalculationGuiServiceTest : NUnitFormTestWithHiddenDesktop
+    public class HydraulicBoundaryLocationCalculationGuiServiceTest : NUnitFormTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs	(.../RiskeerContextMenuItemFactoryTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.Common.Forms.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class RiskeerContextMenuItemFactoryTest : NUnitFormTestWithHiddenDesktop
+    public class RiskeerContextMenuItemFactoryTest : NUnitFormTest
     {
         [Test]
         public void CreateAddCalculationGroupItem_Always_CreatesDecoratedItem()
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs	(.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs	(.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Riskeer.DuneErosion.Data;
@@ -32,7 +31,7 @@
 namespace Riskeer.DuneErosion.Forms.Test
 {
     [TestFixture]
-    public class DuneErosionFailureMechanismPropertyChangeHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class DuneErosionFailureMechanismPropertyChangeHandlerTest : NUnitFormTest
     {
         [Test]
         public void SetPropertyValueAfterConfirmation_WithoutFailureMechanism_ThrowsArgumentNullException()
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs	(.../DikeProfilesContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs	(.../DikeProfilesContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class DikeProfilesContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class DikeProfilesContextImportInfoTest : NUnitFormTest
     {
         [Test]
         public void Name_Always_ReturnExpectedName()
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -56,7 +56,7 @@
 namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateDikeProfileIndex = 5;
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -59,7 +59,7 @@
 namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuGenerateCalculationsIndexRootGroup = 3;
         private const int contextMenuAddCalculationGroupIndexRootGroup = 5;
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -56,7 +56,7 @@
 namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/UpdateInfos/DikeProfilesContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/UpdateInfos/DikeProfilesContextUpdateInfoTest.cs	(.../DikeProfilesContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/UpdateInfos/DikeProfilesContextUpdateInfoTest.cs	(.../DikeProfilesContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class DikeProfilesContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class DikeProfilesContextUpdateInfoTest : NUnitFormTest
     {
         [Test]
         public void Name_Always_ReturnExpectedName()
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
@@ -34,7 +33,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Forms.Test
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest : NUnitFormTest
     {
         [Test]
         public void SetPropertyValueAfterConfirmation_WithoutFailureMechanism_ThrowsArgumentNullException()
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -53,7 +53,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunDesignWaterLevelCalculationsIndex = 2;
         private const int contextMenuClearIllustrationPointsIndex = 4;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -56,7 +56,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunDesignWaterLevelCalculationsIndex = 0;
         private const int contextMenuClearIllustrationPointsIndex = 2;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -57,7 +57,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuCalculateAllIndex = 2;
         private const int contextMenuClearIllustrationPointsIndex = 4;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -56,7 +56,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateForeshoreProfileIndex = 5;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -58,7 +58,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuAddGenerateCalculationsIndex = 3;
         private const int contextMenuAddCalculationGroupIndexRootGroup = 5;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -53,7 +53,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunWaveHeightCalculationsIndex = 2;
         private const int contextMenuClearIllustrationPointsIndex = 4;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -56,7 +56,7 @@
 namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunWaveHeightCalculationsIndex = 0;
         private const int contextMenuClearIllustrationPointsIndex = 2;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs	(.../HeightStructuresContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs	(.../HeightStructuresContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.HeightStructures.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class HeightStructuresContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class HeightStructuresContextImportInfoTest : NUnitFormTest
     {
         [Test]
         public void CreateFileImporter_Always_ReturnFileImporter()
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.HeightStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class HeightStructuresCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class HeightStructuresCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateForeshoreProfileIndex = 5;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -57,7 +57,7 @@
 namespace Riskeer.HeightStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class HeightStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class HeightStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuGenerateCalculationsIndexRootGroup = 3;
         private const int contextMenuAddCalculationGroupIndexRootGroup = 5;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -58,7 +58,7 @@
 namespace Riskeer.HeightStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class HeightStructuresFailureMechanismContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class HeightStructuresFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs	(.../HeightStructuresContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs	(.../HeightStructuresContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -42,7 +42,7 @@
 namespace Riskeer.HeightStructures.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class HeightStructuresContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class HeightStructuresContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private HeightStructuresPlugin plugin;
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs	(.../AssessmentSectionFromFileCommandHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs	(.../AssessmentSectionFromFileCommandHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -46,7 +46,7 @@
 namespace Riskeer.Integration.Forms.Test.Commands
 {
     [TestFixture]
-    public class AssessmentSectionFromFileCommandHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class AssessmentSectionFromFileCommandHandlerTest : NUnitFormTest
     {
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, "ReferenceLineMetaImporter");
 
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/BackgroundMapDataSelectionDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.Integration.Forms.Test.Dialogs
 {
     [TestFixture]
-    public class BackgroundMapDataSelectionDialogTest : NUnitFormTestWithHiddenDesktop
+    public class BackgroundMapDataSelectionDialogTest : NUnitFormTest
     {
         private MockRepository mockRepository;
         private ITileSourceFactory tileFactory;
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/ReferenceLineMetaSelectionDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/ReferenceLineMetaSelectionDialogTest.cs	(.../ReferenceLineMetaSelectionDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/ReferenceLineMetaSelectionDialogTest.cs	(.../ReferenceLineMetaSelectionDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -25,7 +25,6 @@
 using System.Windows.Forms;
 using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.Dialogs;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Riskeer.Common.Data.AssessmentSection;
@@ -36,7 +35,7 @@
 namespace Riskeer.Integration.Forms.Test.Dialogs
 {
     [TestFixture]
-    public class ReferenceLineMetaSelectionDialogTest : NUnitFormTestWithHiddenDesktop
+    public class ReferenceLineMetaSelectionDialogTest : NUnitFormTest
     {
         private const int assessmentSectionIdColumn = 0;
         private const int signalingValueColumn = 1;
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs	(.../AssessmentSectionMergeDataProviderDialogTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs	(.../AssessmentSectionMergeDataProviderDialogTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -42,7 +42,7 @@
 namespace Riskeer.Integration.Forms.Test.Merge
 {
     [TestFixture]
-    public class AssessmentSectionMergeDataProviderDialogTest : NUnitFormTestWithHiddenDesktop
+    public class AssessmentSectionMergeDataProviderDialogTest : NUnitFormTest
     {
         private const int isSelectedIndex = 0;
         private const int failureMechanismNameIndex = 1;
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionCompositionPropertiesTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionCompositionPropertiesTest.cs	(.../AssessmentSectionCompositionPropertiesTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssessmentSectionCompositionPropertiesTest.cs	(.../AssessmentSectionCompositionPropertiesTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -37,7 +37,7 @@
 namespace Riskeer.Integration.Forms.Test.PropertyClasses
 {
     [TestFixture]
-    public class AssessmentSectionCompositionPropertiesTest : NUnitFormTestWithHiddenDesktop
+    public class AssessmentSectionCompositionPropertiesTest : NUnitFormTest
     {
         [Test]
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -44,7 +44,7 @@
 namespace Riskeer.Integration.Forms.Test.PropertyClasses
 {
     [TestFixture]
-    public class NormPropertiesIntegrationTest : NUnitFormTestWithHiddenDesktop
+    public class NormPropertiesIntegrationTest : NUnitFormTest
     {
         private const string messageAllHydraulicBoundaryOutputCleared = "Alle berekende hydraulische belastingen zijn verwijderd.";
         private const string messageCalculationsRemoved = "De resultaten van {0} berekeningen zijn verwijderd.";
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs	(.../NormPropertiesTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs	(.../NormPropertiesTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -38,7 +38,7 @@
 namespace Riskeer.Integration.Forms.Test.PropertyClasses
 {
     [TestFixture]
-    public class NormPropertiesTest : NUnitFormTestWithHiddenDesktop
+    public class NormPropertiesTest : NUnitFormTest
     {
         [Test]
         public void Constructor_FailureMechanismContributionNull_ThrowsArgumentNullException()
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -27,7 +27,6 @@
 using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Commands;
-using Core.Common.TestUtil;
 using Core.Common.Util;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -42,7 +41,7 @@
 namespace Riskeer.Integration.Forms.Test.Views
 {
     [TestFixture]
-    public class FailureMechanismContributionViewTest : NUnitFormTestWithHiddenDesktop
+    public class FailureMechanismContributionViewTest : NUnitFormTest
     {
         private const string returnPeriodLabelName = "returnPeriodLabel";
         private const string dataGridViewControlName = "dataGridView";
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -51,7 +51,7 @@
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class AssessmentSectionCompositionChangeHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class AssessmentSectionCompositionChangeHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_ViewCommandsNull_ThrowsArgumentNullException()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -41,7 +41,7 @@
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class FailureMechanismContributionNormChangeHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class FailureMechanismContributionNormChangeHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_ExpectedValues()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -44,7 +44,7 @@
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class HydraulicBoundaryDatabaseUpdateHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class HydraulicBoundaryDatabaseUpdateHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseImportHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseImportHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseImportHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -37,7 +37,7 @@
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class HydraulicLocationConfigurationDatabaseImportHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class HydraulicLocationConfigurationDatabaseImportHandlerTest : NUnitFormTest
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Plugin);
         private static readonly string testDataDirectory = Path.Combine(testDataPath, nameof(HydraulicLocationConfigurationDatabaseImportHandler));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -41,7 +41,7 @@
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class HydraulicLocationConfigurationDatabaseUpdateHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class HydraulicLocationConfigurationDatabaseUpdateHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs	(.../ReferenceLineUpdateHandlerTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs	(.../ReferenceLineUpdateHandlerTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Gui.Commands;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -48,7 +47,7 @@
 namespace Riskeer.Integration.Plugin.Test.Handlers
 {
     [TestFixture]
-    public class ReferenceLineUpdateHandlerTest : NUnitFormTestWithHiddenDesktop
+    public class ReferenceLineUpdateHandlerTest : NUnitFormTest
     {
         [Test]
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs	(.../ForeshoreProfilesContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs	(.../ForeshoreProfilesContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.Integration.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class ForeshoreProfilesContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ForeshoreProfilesContextImportInfoTest : NUnitFormTest
     {
         [Test]
         public void CreateFileImporter_Always_ReturnFileImporter()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionProviderTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionProviderTest.cs	(.../AssessmentSectionProviderTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionProviderTest.cs	(.../AssessmentSectionProviderTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -34,7 +34,7 @@
 namespace Riskeer.Integration.Plugin.Test.Merge
 {
     [TestFixture]
-    public class AssessmentSectionProviderTest : NUnitFormTestWithHiddenDesktop
+    public class AssessmentSectionProviderTest : NUnitFormTest
     {
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Plugin, nameof(AssessmentSectionProvider));
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -67,7 +67,7 @@
 namespace Riskeer.Integration.Plugin.Test
 {
     [TestFixture]
-    public class RiskeerPluginTest : NUnitFormTestWithHiddenDesktop
+    public class RiskeerPluginTest : NUnitFormTest
     {
         [Test]
         [Apartment(ApartmentState.STA)]
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -51,7 +51,7 @@
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class BackgroundDataTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class BackgroundDataTreeNodeInfoTest : NUnitFormTest
     {
         private const int selectContextMenuIndex = 0;
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class DesignWaterLevelCalculationsContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class DesignWaterLevelCalculationsContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunAssessmentLevelCalculationsIndex = 2;
         private const int contextMenuClearIllustrationPointsIndex = 4;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunDesignWaterLevelCalculationsIndex = 0;
         private const int contextMenuClearIllustrationPointsIndex = 2;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -55,7 +55,7 @@
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class HydraulicBoundaryDatabaseContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class HydraulicBoundaryDatabaseContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuImportHydraulicBoundaryDatabaseIndex = 0;
         private const int contextMenuCalculateAllIndex = 3;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class WaveHeightCalculationsContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class WaveHeightCalculationsContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunWaveHeightCalculationsIndex = 2;
         private const int contextMenuClearIllustrationPointsIndex = 4;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class WaveHeightCalculationsGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class WaveHeightCalculationsGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRunWaveHeightCalculationsIndex = 0;
         private const int contextMenuClearIllustrationPointsIndex = 2;
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/ForeshoreProfileContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/ForeshoreProfileContextUpdateInfoTest.cs	(.../ForeshoreProfileContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/ForeshoreProfileContextUpdateInfoTest.cs	(.../ForeshoreProfileContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.Integration.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class ForeshoreProfileContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class ForeshoreProfileContextUpdateInfoTest : NUnitFormTest
     {
         [Test]
         public void CreateFileImporter_Always_ReturnFileImporter()
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -47,7 +47,7 @@
 namespace Riskeer.MacroStabilityInwards.Forms.Test.Views
 {
     [TestFixture]
-    public class MacroStabilityInwardsCalculationsViewTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsCalculationsViewTest : NUnitFormTest
     {
         private const int nameColumnIndex = 0;
         private const int stochasticSoilModelsColumnIndex = 1;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -26,7 +26,6 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Controls.Views;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -43,7 +42,7 @@
 namespace Riskeer.MacroStabilityInwards.Forms.Test.Views
 {
     [TestFixture]
-    public class MacroStabilityInwardsScenariosViewTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsScenariosViewTest : NUnitFormTest
     {
         private const int isRelevantColumnIndex = 0;
         private const int contributionColumnIndex = 1;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsStochasticSoilModelCollectionContextImportInfoTest : NUnitFormTest
     {
         private ImportInfo importInfo;
         private MacroStabilityInwardsPlugin plugin;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsSurfaceLinesContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsSurfaceLinesContextImportInfoTest : NUnitFormTest
     {
         private ImportInfo importInfo;
         private MacroStabilityInwardsPlugin plugin;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -53,7 +53,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuImportCalculationGroupIndexRootGroup = 2;
         private const int contextMenuExportCalculationGroupIndexRootGroup = 3;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -51,7 +51,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuValidateIndex = 6;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -39,7 +39,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest : NUnitFormTest
     {
         private MockRepository mocks;
         private MacroStabilityInwardsPlugin plugin;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -42,7 +42,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsStochasticSoilModelCollectionContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private MacroStabilityInwardsPlugin plugin;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs	(.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -41,7 +41,7 @@
 namespace Riskeer.MacroStabilityInwards.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private MacroStabilityInwardsPlugin plugin;
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -49,7 +49,7 @@
 namespace Riskeer.Piping.Forms.Test.Views
 {
     [TestFixture]
-    public class PipingCalculationsViewTest : NUnitFormTestWithHiddenDesktop
+    public class PipingCalculationsViewTest : NUnitFormTest
     {
         private const int nameColumnIndex = 0;
         private const int stochasticSoilModelsColumnIndex = 1;
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -27,7 +27,6 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Controls.Views;
-using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -44,7 +43,7 @@
 namespace Riskeer.Piping.Forms.Test.Views
 {
     [TestFixture]
-    public class PipingScenariosViewTest : NUnitFormTestWithHiddenDesktop
+    public class PipingScenariosViewTest : NUnitFormTest
     {
         private const int isRelevantColumnIndex = 0;
         private const int contributionColumnIndex = 1;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingStochasticSoilModelCollectionContextImportInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.Piping.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class PipingStochasticSoilModelCollectionContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingStochasticSoilModelCollectionContextImportInfoTest : NUnitFormTest
     {
         private ImportInfo importInfo;
         private PipingPlugin plugin;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs	(.../PipingSurfaceLinesContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ImportInfos/PipingSurfaceLinesContextImportInfoTest.cs	(.../PipingSurfaceLinesContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.Piping.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class PipingSurfaceLinesContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingSurfaceLinesContextImportInfoTest : NUnitFormTest
     {
         private ImportInfo importInfo;
         private PipingPlugin plugin;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class PipingCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuImportCalculationGroupIndexRootGroup = 2;
         private const int contextMenuExportCalculationGroupIndexRootGroup = 3;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -52,7 +52,7 @@
 namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class PipingCalculationScenarioContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingCalculationScenarioContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateEntryAndExitPointIndex = 5;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -53,7 +53,7 @@
 namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class PipingFailureMechanismContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -39,7 +39,7 @@
 namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class PipingStochasticSoilModelCollectionContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingStochasticSoilModelCollectionContextTreeNodeInfoTest : NUnitFormTest
     {
         private MockRepository mocks;
         private PipingPlugin plugin;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs	(.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -42,7 +42,7 @@
 namespace Riskeer.Piping.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class PipingStochasticSoilModelCollectionContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingStochasticSoilModelCollectionContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private PipingPlugin plugin;
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs	(.../PipingSurfaceLinesContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/UpdateInfos/PipingSurfaceLinesContextUpdateInfoTest.cs	(.../PipingSurfaceLinesContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -41,7 +41,7 @@
 namespace Riskeer.Piping.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class PipingSurfaceLinesContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class PipingSurfaceLinesContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private PipingPlugin plugin;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs	(.../StabilityPointStructuresContextImportInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs	(.../StabilityPointStructuresContextImportInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -43,7 +43,7 @@
 namespace Riskeer.StabilityPointStructures.Plugin.Test.ImportInfos
 {
     [TestFixture]
-    public class StabilityPointStructuresContextImportInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityPointStructuresContextImportInfoTest : NUnitFormTest
     {
         [Test]
         public void CreateFileImporter_Always_ReturnFileImporter()
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -54,7 +54,7 @@
 namespace Riskeer.StabilityPointStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class StabilityPointStructuresCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityPointStructuresCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateForeshoreProfileIndex = 5;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -57,7 +57,7 @@
 namespace Riskeer.StabilityPointStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuGenerateCalculationsIndexRootGroup = 3;
         private const int contextMenuAddCalculationGroupIndexRootGroup = 5;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -58,7 +58,7 @@
 namespace Riskeer.StabilityPointStructures.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/UpdateInfos/StabilityPointStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/UpdateInfos/StabilityPointStructuresContextUpdateInfoTest.cs	(.../StabilityPointStructuresContextUpdateInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/UpdateInfos/StabilityPointStructuresContextUpdateInfoTest.cs	(.../StabilityPointStructuresContextUpdateInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -42,7 +42,7 @@
 namespace Riskeer.StabilityPointStructures.Plugin.Test.UpdateInfos
 {
     [TestFixture]
-    public class StabilityPointStructuresContextUpdateInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityPointStructuresContextUpdateInfoTest : NUnitFormTest
     {
         private UpdateInfo updateInfo;
         private StabilityPointStructuresPlugin plugin;
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -55,7 +55,7 @@
 namespace Riskeer.StabilityStoneCover.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateForeshoreProfileIndex = 5;
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -57,7 +57,7 @@
 namespace Riskeer.StabilityStoneCover.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuAddGenerateCalculationsIndex = 3;
         private const int contextMenuAddCalculationGroupIndexRootGroup = 5;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -55,7 +55,7 @@
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuDuplicateIndex = 2;
         private const int contextMenuUpdateForeshoreProfileIndex = 5;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9b8c04020e3da185b8e28c0916ce5dfeea6d13 -r56d072b8342f3e54ba89124ab918bd1529e257a3
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision ca9b8c04020e3da185b8e28c0916ce5dfeea6d13)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
@@ -56,7 +56,7 @@
 namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
-    public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTestWithHiddenDesktop
+    public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest : NUnitFormTest
     {
         private const int contextMenuImportConfigurationIndex = 0;
         private const int contextMenuExportConfigurationIndex = 1;