Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -reb7f8fe1e85f00faf16a1cddef014728d60a2b19 -r5bdfe106fefb36f7e677da7e75afec1eba7eedd3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision eb7f8fe1e85f00faf16a1cddef014728d60a2b19)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 5bdfe106fefb36f7e677da7e75afec1eba7eedd3)
@@ -362,13 +362,10 @@
             var mocks = new MockRepository();
             var observer = mocks.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver()).Repeat.Twice();
-
             var nodeMock = mocks.Stub<ITreeNode>();
-            var guiMock = mocks.StrictMock<IGui>();
-            guiMock.Expect(g => g.ApplicationCore).Return(new ApplicationCore()).Repeat.Twice();
 
             var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
-            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(guiMock, nodeMock));
+            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
 
             var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             dataMock.Calculations.Add(new PipingCalculation
@@ -420,7 +417,7 @@
         }
 
         [Test]
-        public void GetContextMenu_NoGui_ReturnsEmptyContextMenu()
+        public void GetContextMenu_NoGuiCommandHandler_ReturnsEmptyContextMenu()
         {
             // Setup
             var mocks = new MockRepository();
@@ -458,11 +455,10 @@
             // Setup
             var mocks = new MockRepository();
             var nodeMock = mocks.Stub<ITreeNode>();
-            var guiMock = mocks.StrictMock<IGui>();
-            guiMock.Expect(g => g.ApplicationCore).Return(new ApplicationCore()).Repeat.Twice();
+            var commandHandlerMock = mocks.DynamicMock<IGuiCommandHandler>();
 
             var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
-            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(guiMock, nodeMock));
+            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(commandHandlerMock, nodeMock));
 
             var nodePresenter = new PipingFailureMechanismNodePresenter
             {