Index: Core/Common/test/Core.Common.Gui.Test/StorageCommandHandlerTest.cs
===================================================================
diff -u -rd31b2f10fb6c47a32d6eb62e56d635b6c97f658c -r9078a958e72b7ffe61f066c0ba0356bc7266716c
--- Core/Common/test/Core.Common.Gui.Test/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision d31b2f10fb6c47a32d6eb62e56d635b6c97f658c)
+++ Core/Common/test/Core.Common.Gui.Test/StorageCommandHandlerTest.cs	(.../StorageCommandHandlerTest.cs)	(revision 9078a958e72b7ffe61f066c0ba0356bc7266716c)
@@ -115,5 +115,32 @@
             Assert.AreEqual("", guiMock.ProjectFilePath);
             mocks.VerifyAll();
         }
+
+        [Test]
+        public void CloseProject_EmptyProject_DoesNotThrowException()
+        {
+            IViewCommands viewCommands = mocks.StrictMock<IViewCommands>();
+            viewCommands.Expect(g => g.RemoveAllViewsForItem(null)).IgnoreArguments();
+
+            Project projectMock = mocks.StrictMock<Project>();
+
+            IGui guiMock = mocks.StrictMock<IGui>();
+            guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+            guiMock.Stub(g => g.ProjectClosing += null).IgnoreArguments();
+            guiMock.Expect(x => x.Project).PropertyBehavior();
+            guiMock.Expect(x => x.ProjectFilePath).PropertyBehavior();
+            guiMock.Expect(x => x.Selection).PropertyBehavior();
+            guiMock.Stub(x => x.RefreshGui());
+
+            guiMock.Project = projectMock;
+            guiMock.Selection = guiMock.Project;
+
+            mocks.ReplayAll();
+
+            StorageCommandHandler storageCommandHandler = new StorageCommandHandler(viewCommands, guiMock);
+
+            TestDelegate closeProject = () => storageCommandHandler.CloseProject();
+            Assert.DoesNotThrow(closeProject);
+        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -r3a30a9af978ca6321aecfcc5fda26e9344a20939 -r9078a958e72b7ffe61f066c0ba0356bc7266716c
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 3a30a9af978ca6321aecfcc5fda26e9344a20939)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs	(.../RingtoetsGuiIntegrationTest.cs)	(revision 9078a958e72b7ffe61f066c0ba0356bc7266716c)
@@ -20,19 +20,6 @@
 
         [Test]
         [RequiresSTA]
-        public void CloseProject_EmptyProject_DoesNotThrowException()
-        {
-            using (var gui = new RingtoetsGui())
-            {
-                gui.MainWindow = new MainWindow(gui);
-                gui.Run();
-                TestDelegate closeProject = () => gui.StorageCommands.CloseProject();
-                Assert.DoesNotThrow(closeProject);
-            }
-        }
-
-        [Test]
-        [RequiresSTA]
         public void StartGuiWithToolboxDoesNotCrash()
         {
             using (var gui = new RingtoetsGui())