Index: Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs
===================================================================
diff -u -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821 -r8ed8b50e2b089b2bc1787b03ff2049e99e3435e6
--- Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
+++ Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision 8ed8b50e2b089b2bc1787b03ff2049e99e3435e6)
@@ -18,8 +18,8 @@
                 // Assert
                 Assert.IsNotNull(dialog.Icon);
                 Assert.IsTrue(dialog.ShowIcon);
-                Assert.AreEqual(470, dialog.MinimumSize.Width);
-                Assert.AreEqual(200, dialog.MinimumSize.Height);
+                Assert.AreEqual(0, dialog.MinimumSize.Width); // Set during load
+                Assert.AreEqual(0, dialog.MinimumSize.Height); // Set during load
                 Assert.AreEqual(FormBorderStyle.Sizable, dialog.FormBorderStyle);
                 Assert.AreEqual(FormStartPosition.CenterParent, dialog.StartPosition);
                 Assert.IsFalse(dialog.ShowInTaskbar);
@@ -31,6 +31,28 @@
         }
 
         [Test]
+        public void ShowDialog_ExceptionDialog_MinimumSizeSet()
+        {
+            // Setup
+            DialogBoxHandler = (name, wnd) =>
+            {
+                var openedDialog = new FormTester(name);
+
+                openedDialog.Close();
+            };
+
+            using (var dialog = new ExceptionDialog(null, null))
+            {
+                // Call
+                dialog.ShowDialog();
+
+                // Assert
+                Assert.AreEqual(470, dialog.MinimumSize.Width);
+                Assert.AreEqual(200, dialog.MinimumSize.Height);
+            }
+        }
+
+        [Test]
         public void ShowDialog_ExceptionDialogWithException_ExceptionMessageSetToTextBox()
         {
             // Setup
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -r5fc49ff1f8950ee4e33887edb6c543fac700b5dd -r8ed8b50e2b089b2bc1787b03ff2049e99e3435e6
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 5fc49ff1f8950ee4e33887edb6c543fac700b5dd)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 8ed8b50e2b089b2bc1787b03ff2049e99e3435e6)
@@ -22,22 +22,6 @@
         }
 
         [Test]
-        public void DeleteProjectDataDirectoryShouldNotThrowExceptionOnNewProjectAndShouldNotHang()
-        {
-            using (var gui = new RingtoetsGui())
-            {
-                var applicationCore = gui.ApplicationCore;
-
-                applicationCore.AddPlugin(new SharpMapGisApplicationPlugin());
-                gui.Plugins.Add(new ProjectExplorerGuiPlugin());
-                gui.Run();
-
-                gui.CommandHandler.TryCreateNewProject();
-                gui.CommandHandler.TryCreateNewProject();
-            }
-        }
-
-        [Test]
         public void ClosingEmptyProjectShouldNotGiveException()
         {
             using (var gui = new RingtoetsGui())
@@ -67,26 +51,6 @@
         }
 
         [Test]
-        public void CreateNewProjectAfterStartWithCommonPluginsShouldBeFast()
-        {
-            using (var gui = new RingtoetsGui())
-            {
-                var applicationCore = gui.ApplicationCore;
-
-                applicationCore.AddPlugin(new SharpMapGisApplicationPlugin());
-                gui.Plugins.Add(new SharpMapGisGuiPlugin());
-                gui.Plugins.Add(new CommonToolsGuiPlugin());
-                gui.Plugins.Add(new ProjectExplorerGuiPlugin());
-
-                gui.Run();
-
-                Action onShown = () => TestHelper.AssertIsFasterThan(300, () => gui.Project = new Project());
-
-                WpfTestHelper.ShowModal((Control) gui.MainWindow, onShown);
-            }
-        }
-
-        [Test]
         public void GuiSelectionIsSetToProjectAfterStartWithProjectExplorer()
         {
             // initialize