Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenMapViewCommandTest.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenMapViewCommandTest.cs	(.../OpenMapViewCommandTest.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenMapViewCommandTest.cs	(.../OpenMapViewCommandTest.cs)	(revision ce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b)
@@ -20,8 +20,7 @@
 // All rights reserved.
 
 using Core.Common.Controls.Commands;
-using Core.Common.Gui;
-using Core.Common.Gui.Forms.ViewHost;
+using Core.Common.Gui.Commands;
 using Demo.Ringtoets.Commands;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -36,11 +35,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var viewController = mocks.Stub<IViewController>();
+            var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
             // Call
-            var command = new OpenMapViewCommand(viewController);
+            var command = new OpenMapViewCommand(viewCommands);
 
             // Assert
             Assert.IsInstanceOf<ICommand>(command);
@@ -53,14 +52,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var viewController = mocks.StrictMock<IViewController>();
-            var documentViewController = mocks.StrictMock<IDocumentViewController>();
-            viewController.Expect(g => g.DocumentViewController).Return(documentViewController);
-            documentViewController.Expect(vr => vr.OpenViewForData(null)).IgnoreArguments().Return(true);
-
+            var viewCommands = mocks.StrictMock<IViewCommands>();
+            viewCommands.Expect(g => g.OpenView(Arg<object>.Is.NotNull));
             mocks.ReplayAll();
 
-            var command = new OpenMapViewCommand(viewController);
+            var command = new OpenMapViewCommand(viewCommands);
 
             // Call
             command.Execute();
@@ -74,11 +70,11 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var viewController = mocks.Stub<IViewController>();
+            var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
             // Call
-            var command = new OpenMapViewCommand(viewController);
+            var command = new OpenMapViewCommand(viewCommands);
 
             // Assert
             Assert.IsFalse(command.Checked);