Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r7299ddaaafe53e58adef80f0e05a0576f66e1edf -ra85e384df91356b2c2716591531a863e01da876b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs	(.../FailureMechanismNodePresenterTest.cs)	(revision 7299ddaaafe53e58adef80f0e05a0576f66e1edf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs	(.../FailureMechanismNodePresenterTest.cs)	(revision a85e384df91356b2c2716591531a863e01da876b)
@@ -16,17 +16,27 @@
 
 using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using CommonResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.NodePresenters
 {
     [TestFixture]
     public class FailureMechanismNodePresenterTest
     {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+        }
+
         [Test]
         public void DefaultConstructor_ExpectedValues()
         {
             // Call
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
 
             // Assert
             Assert.IsInstanceOf<RingtoetsNodePresenterBase<FailureMechanismPlaceholder>>(nodePresenter);
@@ -36,14 +46,14 @@
         public void UpdateNode_ValidOutputPlaceholderData_UpdateTreeNode()
         {
             // Setup
-            var mocks = new MockRepository();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
             var parentNode = mocks.StrictMock<ITreeNode>();
             var nodeToUpdate = mocks.Stub<ITreeNode>();
             mocks.ReplayAll();
 
             var dataObject = new FailureMechanismPlaceholder("test");
 
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
 
             // Call
             nodePresenter.UpdateNode(parentNode, nodeToUpdate, dataObject);
@@ -59,7 +69,8 @@
         public void CanRenameNode_Always_ReturnFalse()
         {
             // Setup
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
 
             // Call
             bool isRenamingAllowed = nodePresenter.CanRenameNode(null);
@@ -72,7 +83,8 @@
         public void CanRenameTo_Always_ReturnFalse()
         {
             // Setup
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
 
             // Call
             bool isRenamingAllowed = nodePresenter.CanRenameNodeTo(null, null);
@@ -85,7 +97,8 @@
         public void CanRemove_Always_ReturnFalse()
         {
             // Setup
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
 
             // Call
             bool isRemovalAllowed = nodePresenter.CanRemove(null, null);
@@ -98,7 +111,8 @@
         public void GetChildNodeObjects_Always_ReturnInputAndOutput()
         {
             // Setup
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
             var failureMechanism = new FailureMechanismPlaceholder("test");
 
             // Call
@@ -126,43 +140,49 @@
         public void GetContextMenu_Always_ReturnsContextMenuWithItems()
         {
             // Setup
-            var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            contextMenuProvider.Expect(cmp => cmp.Get(new object())).IgnoreArguments().Return(new ContextMenuStrip());
 
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
             var failureMechanism = new FailureMechanismPlaceholder("test");
 
+            mocks.ReplayAll();
+
             // Call
             var menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
 
             // Assert
-            Assert.AreEqual(9, menu.Items.Count);
+            Assert.AreEqual(8, menu.Items.Count);
 
             TestHelper.AssertContextMenuStripContainsItem(menu, 0, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon, false);
             TestHelper.AssertContextMenuStripContainsItem(menu, 1, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon, false);
             TestHelper.AssertContextMenuStripContainsItem(menu, 3, RingtoetsCommonFormsResources.FailureMechanism_Expand_all, RingtoetsCommonFormsResources.FailureMechanism_Expand_all_ToolTip, RingtoetsCommonFormsResources.ExpandAllIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.FailureMechanism_Collapse_all, RingtoetsCommonFormsResources.FailureMechanism_Collapse_all_ToolTip, RingtoetsCommonFormsResources.CollapseAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.FailureMechanism_Export, RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, RingtoetsCommonFormsResources.ExportIcon, false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 8, RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 7, RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon);
 
-            CollectionAssert.AllItemsAreInstancesOfType(new []{menu.Items[2], menu.Items[5],menu.Items[7]}, typeof(ToolStripSeparator));
+            CollectionAssert.AllItemsAreInstancesOfType(new []{menu.Items[2], menu.Items[5],menu.Items[6]}, typeof(ToolStripSeparator));
+
+            mocks.VerifyAll();
         }
 
         [Test]
         public void GetContextMenu_ShowPropertiesClickedWithHandler_CallsShowProperties()
         {
             // Setup
-            var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            contextMenuProvider.Expect(cmp => cmp.Get(new object())).IgnoreArguments().Return(new ContextMenuStrip());
+
             var commandHandlerMock = mocks.StrictMock<IGuiCommandHandler>();
             commandHandlerMock.Expect(ch => ch.ShowProperties());
 
-            var nodePresenter = new FailureMechanismNodePresenter(commandHandlerMock);
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider, commandHandlerMock);
             var failureMechanism = new FailureMechanismPlaceholder("test");
 
             mocks.ReplayAll();
 
-            var showPropertiesMenuItem = nodePresenter.GetContextMenu(nodeMock, failureMechanism).Items[8];
+            var showPropertiesMenuItem = nodePresenter.GetContextMenu(nodeMock, failureMechanism).Items[7];
 
             // Call
             showPropertiesMenuItem.PerformClick();
@@ -175,16 +195,21 @@
         public void GetContextMenu_ShowPropertiesClickedWithoutHandler_NoExceptions()
         {
             // Setup
-            var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
+            var contextMenuProvider = mocks.StrictMock<IContextMenuProvider>();
+            contextMenuProvider.Expect(cmp => cmp.Get(new object())).IgnoreArguments().Return(new ContextMenuStrip());
 
-            var nodePresenter = new FailureMechanismNodePresenter();
+            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
             var failureMechanism = new FailureMechanismPlaceholder("test");
 
-            var showPropertiesMenuItem = nodePresenter.GetContextMenu(nodeMock, failureMechanism).Items[8];
+            mocks.ReplayAll();
 
+            var showPropertiesMenuItem = nodePresenter.GetContextMenu(nodeMock, failureMechanism).Items[7];
+
             // Call & Assert
             showPropertiesMenuItem.PerformClick();
+
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file