Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r5bdfe106fefb36f7e677da7e75afec1eba7eedd3 -r6b639dc3027f47a35279aa8b4925ca5ed1c71b5f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 5bdfe106fefb36f7e677da7e75afec1eba7eedd3)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 6b639dc3027f47a35279aa8b4925ca5ed1c71b5f)
@@ -71,7 +71,6 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingFailureMechanismNodePresenter();
@@ -130,7 +129,7 @@
             var nodePresenter = new PipingFailureMechanismNodePresenter();
 
             // Call
-            var renameAllowed = nodePresenter.CanRenameNode(nodeMock);
+            bool renameAllowed = nodePresenter.CanRenameNode(nodeMock);
 
             // Assert
             Assert.IsFalse(renameAllowed);
@@ -148,7 +147,7 @@
             var nodePresenter = new PipingFailureMechanismNodePresenter();
 
             // Call
-            var renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, "<Insert New Name Here>");
+            bool renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, "<Insert New Name Here>");
 
             // Assert
             Assert.IsFalse(renameAllowed);
@@ -386,7 +385,7 @@
 
             mocks.ReplayAll();
 
-            var contextMenuAdapter = nodePresenter.GetContextMenu(nodeMock, dataMock);
+            ContextMenuStrip contextMenuAdapter = nodePresenter.GetContextMenu(nodeMock, dataMock);
 
             // When
             contextMenuAdapter.Items[contextMenuClearIndex].PerformClick();
@@ -410,7 +409,7 @@
             mocks.ReplayAll();
 
             // Call
-            var menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
+            ContextMenuStrip menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
 
             // Assert
             Assert.IsNull(menu);
@@ -433,7 +432,7 @@
             mocks.ReplayAll();
 
             // Call
-            var menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
+            ContextMenuStrip menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
 
             // Assert
             Assert.AreEqual(9, menu.Items.Count);
@@ -470,7 +469,7 @@
             mocks.ReplayAll();
 
             // Call
-            var menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
+            ContextMenuStrip menu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
 
             // Assert
             Assert.AreEqual(11, menu.Items.Count);
@@ -506,12 +505,12 @@
             mocks.ReplayAll();
 
             // Call
-            var contextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock);
+            ContextMenuStrip contextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock);
 
             // Assert
             Assert.AreEqual(9, contextMenu.Items.Count);
 
-            var clearOutputItem = contextMenu.Items[contextMenuClearIndex];
+            ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex];
             Assert.IsFalse(clearOutputItem.Enabled);
             Assert.AreEqual("Er zijn geen berekeningen met uitvoer om te wissen.", clearOutputItem.ToolTipText);
 
@@ -541,12 +540,12 @@
             mocks.ReplayAll();
 
             // Call
-            var contextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock);
+            ContextMenuStrip contextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock);
 
             // Assert
             Assert.AreEqual(9, contextMenu.Items.Count);
 
-            var clearOutputItem = contextMenu.Items[contextMenuClearIndex];
+            ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex];
             Assert.IsTrue(clearOutputItem.Enabled);
             Assert.AreEqual(RingtoetsFormsResources.Clear_all_output_ToolTip, clearOutputItem.ToolTipText);
 
@@ -577,8 +576,8 @@
             Assert.AreEqual(1, failureMechanism.Calculations.Count);
 
             // Call
-            var contextMenu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
-            var addCalculationItem = contextMenu.Items[contextMenuAddCalculationIndex];
+            ContextMenuStrip contextMenu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
+            ToolStripItem addCalculationItem = contextMenu.Items[contextMenuAddCalculationIndex];
             addCalculationItem.PerformClick();
 
             // Assert
@@ -615,8 +614,8 @@
             Assert.AreEqual(1, failureMechanism.Calculations.Count);
 
             // Call
-            var contextMenu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
-            var addCalculationItem = contextMenu.Items[contextMenuAddFolderIndex];
+            ContextMenuStrip contextMenu = nodePresenter.GetContextMenu(nodeMock, failureMechanism);
+            ToolStripItem addCalculationItem = contextMenu.Items[contextMenuAddFolderIndex];
             addCalculationItem.PerformClick();
 
             // Assert