Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r1efcd2277f5a38d44a78e4a9286eec35134fe8dd -r17e1e8a3db7862fea5fb74b46c375da5065da8dc
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 1efcd2277f5a38d44a78e4a9286eec35134fe8dd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 17e1e8a3db7862fea5fb74b46c375da5065da8dc)
@@ -3,7 +3,6 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls;
-using Core.Common.Gui.Properties;
 using Core.Common.Utils.Collections;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -12,6 +11,7 @@
 
 using Ringtoets.Piping.Forms.NodePresenters;
 using Ringtoets.Piping.Forms.PresentationObjects;
+using Ringtoets.Piping.Forms.Properties;
 
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
@@ -46,7 +46,7 @@
 
             var nodePresenter = new PipingFailureMechanismNodePresenter();
 
-            var pipingData = new PipingData();
+            var pipingData = new PipingFailureMechanism();
 
             // Call
             nodePresenter.UpdateNode(null, pipingNode, pipingData);
@@ -131,7 +131,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var nodeMock = mocks.StrictMock<PipingFailureMechanism>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingFailureMechanismNodePresenter();
@@ -168,7 +168,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingFailureMechanismNodePresenter();
@@ -186,7 +186,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var sourceMock = mocks.StrictMock<ITreeNode>();
             var targetMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
@@ -206,7 +206,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var sourceMock = mocks.StrictMock<ITreeNode>();
             var targetMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
@@ -226,7 +226,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var sourceParentNodeMock = mocks.StrictMock<ITreeNode>();
             var targetParentNodeDataMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
@@ -245,7 +245,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingFailureMechanismNodePresenter();
@@ -287,7 +287,7 @@
             Assert.AreEqual(16, runAllItem.Image.Height);
 
             var clearOutputItem = contextMenu.Items[contextMenuClearIndex];
-            Assert.AreEqual("Wis uitvoer van alle berekeningen", clearOutputItem.Text);
+            Assert.AreEqual("Wis alle uitvoer", clearOutputItem.Text);
             Assert.AreEqual(16, clearOutputItem.Image.Width);
             Assert.AreEqual(16, clearOutputItem.Image.Height);
 
@@ -343,7 +343,7 @@
 
             var clearOutputItem = contextMenu.Items[contextMenuClearIndex];
             Assert.IsTrue(clearOutputItem.Enabled);
-            Assert.IsNull(clearOutputItem.ToolTipText);
+            Assert.AreEqual(Resources.PipingFailureMechanism_Clear_all_output_Tooltip, clearOutputItem.ToolTipText);
 
             mocks.VerifyAll(); // Expect no calls on arguments
         }
@@ -381,7 +381,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var eventArgsMock = mocks.StrictMock<PropertyChangedEventArgs>("");
             mocks.ReplayAll();
@@ -400,7 +400,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
             mocks.ReplayAll();
 
@@ -418,7 +418,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<WtiProject>();
             var nodeMock = mocks.StrictMock<PipingFailureMechanism>();
             mocks.ReplayAll();
 
@@ -433,25 +433,6 @@
         }
 
         [Test]
-        public void CanRemove_NotPipingFailureMechanism_ReturnFalse()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
-            var nodeMock = mocks.StrictMock<object>();
-            mocks.ReplayAll();
-
-            var nodePresenter = new PipingFailureMechanismNodePresenter();
-
-            // Call
-            bool removalAllowed = nodePresenter.CanRemove(dataMock, nodeMock);
-
-            // Assert
-            Assert.IsFalse(removalAllowed);
-            mocks.VerifyAll(); // Expect no calls on arguments
-        }
-
-        [Test]
         public void RemoveNodeData_PipingFailureMechanism_PipingFailureMechanismRemovedFromWtiProject()
         {
             // Setup
@@ -469,24 +450,6 @@
         }
 
         [Test]
-        public void RemoveNodeData_NotPipingFailureMechanism_PipingFailureMechanismStillAssignedToWtiProject()
-        {
-            // Setup
-            var project = new WtiProject();
-            project.InitializePipingFailureMechanism();
-            var expectedFailureMechanism = project.PipingFailureMechanism;
-
-            var nodePresenter = new PipingFailureMechanismNodePresenter();
-
-            // Call
-            bool removalSuccesful = nodePresenter.RemoveNodeData(project, new object());
-
-            // Assert
-            Assert.IsFalse(removalSuccesful);
-            Assert.AreSame(expectedFailureMechanism, project.PipingFailureMechanism);
-        }
-
-        [Test]
         public void GivenMultiplePipingDataWithOutput_WhenClearingOutputFromContextMenu_ThenPipingDataOutputCleared()
         {
             // Given