Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -rec61b187052d8d8ae6cddd3fc1d0546608d9b0c2 -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ec61b187052d8d8ae6cddd3fc1d0546608d9b0c2)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -1635,24 +1635,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kan node uit boom van type {0} niet hernoemen..
-        /// </summary>
-        public static string PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__ {
-            get {
-                return ResourceManager.GetString("PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Kan node uit boom van type {0} niet verwijderen..
-        /// </summary>
-        public static string PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__ {
-            get {
-                return ResourceManager.GetString("PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap PlayAll {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -rec61b187052d8d8ae6cddd3fc1d0546608d9b0c2 -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision ec61b187052d8d8ae6cddd3fc1d0546608d9b0c2)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -869,12 +869,6 @@
   <data name="SplashScreen_Version" xml:space="preserve">
     <value>Versie</value>
   </data>
-  <data name="PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__" xml:space="preserve">
-    <value>Kan node uit boom van type {0} niet hernoemen.</value>
-  </data>
-  <data name="PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__" xml:space="preserve">
-    <value>Kan node uit boom van type {0} niet verwijderen.</value>
-  </data>
   <data name="GuiCommandHandler_TryCloseProject_Closing_current_project_" xml:space="preserve">
     <value>Sluiten van huidig project.</value>
   </data>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -0,0 +1,226 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows.Forms;
+
+using Core.Common.Controls;
+using Core.Common.Utils.Collections;
+
+using Ringtoets.Common.Forms.Properties;
+
+namespace Ringtoets.Common.Forms.NodePresenters
+{
+    /// <summary>
+    /// Implements <see cref="ITreeNodePresenter"/> in a featureless way as possible,
+    /// to serve as a base class for all node presenters.
+    /// </summary>
+    /// <typeparam name="T">The data object class corresponding with the node.</typeparam>
+    public abstract class RingtoetsNodePresenterBase<T> : ITreeNodePresenter
+    {
+        public ITreeView TreeView { get; set; }
+
+        public Type NodeTagType
+        {
+            get
+            {
+                return typeof(T);
+            }
+        }
+
+        public void UpdateNode(ITreeNode parentNode, ITreeNode node, object nodeData)
+        {
+            UpdateNode(parentNode, node, (T)nodeData);
+        }
+
+        public IEnumerable GetChildNodeObjects(object parentNodeData, ITreeNode node)
+        {
+            return GetChildNodeObjects((T)parentNodeData, node).Cast<object>();
+        }
+
+        public virtual bool CanRenameNode(ITreeNode node)
+        {
+            return false;
+        }
+
+        public virtual bool CanRenameNodeTo(ITreeNode node, string newName)
+        {
+            return false;
+        }
+
+        public void OnNodeRenamed(object nodeData, string newName)
+        {
+            var data = (T)nodeData;
+            OnNodeRenamed(data, newName);
+        }
+
+        public virtual void OnNodeChecked(ITreeNode node)
+        {
+            // Not a checked node
+        }
+
+        public DragOperations CanDrag(object nodeData)
+        {
+            return CanDrag((T)nodeData);
+        }
+
+        public DragOperations CanDrop(object item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations)
+        {
+            return CanDrop((T)item, sourceNode, targetNode, validOperations);
+        }
+
+        public bool CanInsert(object item, ITreeNode sourceNode, ITreeNode targetNode)
+        {
+            return CanInsert((T)item, sourceNode, targetNode);
+        }
+
+        public void OnDragDrop(object item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position)
+        {
+            OnDragDrop((T)item, sourceParentNodeData, targetParentNodeData, operation, position);
+        }
+
+        public void OnNodeSelected(object nodeData)
+        {
+            OnNodeSelected((T)nodeData);
+        }
+
+        public ContextMenuStrip GetContextMenu(ITreeNode sender, object nodeData)
+        {
+            return GetContextMenu(sender, (T)nodeData);
+        }
+
+        public void OnPropertyChanged(object sender, ITreeNode node, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged((T)sender, node, e);
+        }
+
+        public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        {
+            OnCollectionChanged((T)sender, e);
+        }
+
+        public bool CanRemove(object parentNodeData, object nodeData)
+        {
+            return CanRemove(parentNodeData, (T)nodeData);
+        }
+
+        public bool RemoveNodeData(object parentNodeData, object nodeData)
+        {
+            return RemoveNodeData(parentNodeData, (T)nodeData);
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.UpdateNode"/>.
+        /// </summary>
+        /// <seealso cref="UpdateNode(ITreeNode, ITreeNode, object)"/>
+        protected abstract void UpdateNode(ITreeNode parentNode, ITreeNode node, T nodeData);
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.GetChildNodeObjects"/>.
+        /// </summary>
+        /// <seealso cref="GetChildNodeObjects(object, ITreeNode)"/>
+        protected virtual IEnumerable GetChildNodeObjects(T nodeData, ITreeNode node)
+        {
+            return Enumerable.Empty<object>();
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.OnNodeRenamed"/>.
+        /// </summary>
+        /// <seealso cref="OnNodeRenamed(object, string)"/>
+        protected virtual void OnNodeRenamed(T nodeData, string newName)
+        {
+            throw new InvalidOperationException(string.Format(Resources.RingtoetsNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type_0_, GetType().Name));
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.CanDrag"/>.
+        /// </summary>
+        /// <seealso cref="CanDrag(object)"/>
+        protected virtual DragOperations CanDrag(T nodeData)
+        {
+            return DragOperations.None;
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.CanDrop"/>.
+        /// </summary>
+        /// <seealso cref="CanDrop(object, ITreeNode, ITreeNode, DragOperations)"/>
+        protected virtual DragOperations CanDrop(T item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations)
+        {
+            return DragOperations.None;
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.CanInsert"/>.
+        /// </summary>
+        /// <seealso cref="CanInsert(object, ITreeNode, ITreeNode)"/>
+        protected virtual bool CanInsert(T item, ITreeNode sourceNode, ITreeNode targetNode)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.OnDragDrop"/>.
+        /// </summary>
+        /// <seealso cref="OnDragDrop(object, object, object, DragOperations, System.Int32)"/>
+        protected virtual void OnDragDrop(T item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position)
+        {
+            // Do nothing
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.OnNodeSelected"/>.
+        /// </summary>
+        /// <seealso cref="OnNodeSelected(object)"/>
+        protected virtual void OnNodeSelected(T nodeData)
+        {
+            // Do nothing
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.GetContextMenu"/>.
+        /// </summary>
+        /// <seealso cref="GetContextMenu(ITreeNode, object)"/>
+        protected virtual ContextMenuStrip GetContextMenu(ITreeNode sender, T nodeData)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.OnPropertyChanged"/>.
+        /// </summary>
+        /// <seealso cref="OnPropertyChanged(object, ITreeNode, PropertyChangedEventArgs)"/>
+        protected virtual void OnPropertyChanged(T sender, ITreeNode node, PropertyChangedEventArgs e)
+        {
+            // Do nothing
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.OnCollectionChanged"/>.
+        /// </summary>
+        /// <seealso cref="OnCollectionChanged(object, NotifyCollectionChangingEventArgs)"/>
+        protected virtual void OnCollectionChanged(T sender, NotifyCollectionChangingEventArgs e)
+        {
+            // Do nothing
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.CanRemove"/>.
+        /// </summary>
+        /// <seealso cref="CanRemove(object, object)"/>
+        protected virtual bool CanRemove(object parentNodeData, T nodeData)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Typed implementation of method <see cref="ITreeNodePresenter.RemoveNodeData"/>.
+        /// </summary>
+        /// <seealso cref="RemoveNodeData(object, object)"/>
+        protected virtual bool RemoveNodeData(object parentNodeData, T nodeData)
+        {
+            throw new InvalidOperationException(String.Format(Resources.RingtoetsNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type_0_, GetType().Name));
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -78,5 +78,23 @@
                 return ResourceManager.GetString("Ringtoets_Category", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kan knoop uit boom van type {0} niet hernoemen..
+        /// </summary>
+        public static string RingtoetsNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type_0_ {
+            get {
+                return ResourceManager.GetString("RingtoetsNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kan knoop uit boom van type {0} niet verwijderen..
+        /// </summary>
+        public static string RingtoetsNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type_0_ {
+            get {
+                return ResourceManager.GetString("RingtoetsNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type_0_", resourceCulture);
+            }
+        }
     }
 }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -124,4 +124,10 @@
   <data name="Ringtoets_Category" xml:space="preserve">
     <value>Algemeen</value>
   </data>
+  <data name="RingtoetsNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type_0_" xml:space="preserve">
+    <value>Kan knoop uit boom van type {0} niet hernoemen.</value>
+  </data>
+  <data name="RingtoetsNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type_0_" xml:space="preserve">
+    <value>Kan knoop uit boom van type {0} niet verwijderen.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -81,6 +81,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Extensions\ContextMenuStripExtensions.cs" />
+    <Compile Include="NodePresenters\RingtoetsNodePresenterBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -97,6 +98,16 @@
   <ItemGroup>
     <None Include="Resources\receipt-text.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/RingtoetsNodePresenterBaseTest.cs	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -0,0 +1,329 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+
+using Core.Common.Controls;
+using Core.Common.Utils.Collections;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Common.Forms.NodePresenters;
+
+namespace Ringtoets.Common.Forms.Test.NodePresenters
+{
+    [TestFixture]
+    public class RingtoetsNodePresenterBaseTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<double>();
+
+            // Assert
+            Assert.AreEqual(typeof(double), nodePresenter.NodeTagType);
+            Assert.IsNull(nodePresenter.TreeView);
+        }
+
+        [Test]
+        public void UpdateNode_WithData_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var parentNode = mocks.StrictMock<ITreeNode>();
+            var pipingNode = mocks.StrictMock<ITreeNode>();
+            var pipingData = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            nodePresenter.UpdateNode(parentNode, pipingNode, pipingData);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on mocks
+        }
+
+        [Test]
+        public void GetChildNodeObjects_Always_ReturnNoChildData()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            var children = nodePresenter.GetChildNodeObjects(dataMock, nodeMock).OfType<object>().ToArray();
+
+            // Assert
+            CollectionAssert.IsEmpty(children);
+            mocks.VerifyAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void CanRenameNode_Always_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            var renameAllowed = nodePresenter.CanRenameNode(nodeMock);
+
+            // Assert
+            Assert.IsFalse(renameAllowed);
+            mocks.VerifyAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void CanRenameNodeTo_Always_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            var renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, "<Insert New Name Here>");
+
+            // Assert
+            Assert.IsFalse(renameAllowed);
+            mocks.ReplayAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void OnNodeRenamed_Always_ThrowInvalidOperationException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            TestDelegate call = () => { nodePresenter.OnNodeRenamed(dataMock, "<Insert New Name Here>"); };
+
+            // Assert
+            var exception = Assert.Throws<InvalidOperationException>(call);
+            var expectedMessage = string.Format("Kan knoop uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name);
+            Assert.AreEqual(expectedMessage, exception.Message);
+            mocks.ReplayAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void OnNodeChecked_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            nodePresenter.OnNodeChecked(nodeMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void CanDrag_Always_ReturnNone()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            DragOperations dragAllowed = nodePresenter.CanDrag(dataMock);
+
+            // Assert
+            Assert.AreEqual(DragOperations.None, dragAllowed);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanDrop_Always_ReturnNone()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var sourceMock = mocks.StrictMock<ITreeNode>();
+            var targetMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            DragOperations dropAllowed = nodePresenter.CanDrop(dataMock, sourceMock, targetMock, DragOperations.Move);
+
+            // Assert
+            Assert.AreEqual(DragOperations.None, dropAllowed);
+            mocks.VerifyAll(); // Expect no calls on mocks.
+        }
+
+        [Test]
+        public void CanInsert_Always_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var sourceMock = mocks.StrictMock<ITreeNode>();
+            var targetMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            bool insertionAllowed = nodePresenter.CanInsert(dataMock, sourceMock, targetMock);
+
+            // Assert
+            Assert.IsFalse(insertionAllowed);
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnDragDrop_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var sourceParentNodeMock = mocks.StrictMock<ITreeNode>();
+            var targetParentNodeDataMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            nodePresenter.OnDragDrop(dataMock, sourceParentNodeMock, targetParentNodeDataMock, DragOperations.Move, 2);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnNodeSelected_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            nodePresenter.OnNodeSelected(dataMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void GetContextMenu_Always_ReturnsNull()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var dataMock = mocks.StrictMock<object>();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            mocks.ReplayAll();
+
+            // Call
+            var contextMenu = nodePresenter.GetContextMenu(nodeMock, dataMock);
+
+            // Assert
+            Assert.IsNull(contextMenu);
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnPropertyChange_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var eventArgsMock = mocks.StrictMock<PropertyChangedEventArgs>("");
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            nodePresenter.OnPropertyChanged(dataMock, nodeMock, eventArgsMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnCollectionChange_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            nodePresenter.OnCollectionChanged(dataMock, eventArgsMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void CanRemove_Always_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            bool removalAllowed = nodePresenter.CanRemove(null, dataMock);
+
+            // Assert
+            Assert.IsFalse(removalAllowed);
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void RemoveNodeData_Always_ThrowInvalidOperationException()
+        {
+            // Setup
+            var nodePresenter = new SimpleRingtoetsNodePresenterBase<object>();
+
+            // Call
+            TestDelegate call = () => nodePresenter.RemoveNodeData(null, new object());
+
+            // Assert
+            var exception = Assert.Throws<InvalidOperationException>(call);
+            Assert.AreEqual(String.Format("Kan knoop uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name), exception.Message);
+        }
+
+        private class SimpleRingtoetsNodePresenterBase<T> : RingtoetsNodePresenterBase<T>
+        {
+            protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, T nodeData) {}
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -84,9 +84,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Extensions\ContextMenuStripExtensionsTest.cs" />
+    <Compile Include="NodePresenters\RingtoetsNodePresenterBaseTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
+      <Name>Core.Common.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj">
       <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
       <Name>Ringtoets.Common.Forms</Name>
Fisheye: Tag ca87cfba59d1e35ba9a281b92e5e90f8c8121db0 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/DikeAssessmentSectionNodePresenterTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/DikeAssessmentSectionNodePresenterTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/DikeAssessmentSectionNodePresenterTest.cs	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -0,0 +1,352 @@
+using System.ComponentModel;
+using System.Linq;
+
+using Core.Common.Base;
+using Core.Common.Controls;
+using Core.Common.Utils.Collections;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.NodePresenters;
+
+namespace Ringtoets.Integration.Forms.Test.NodePresenters
+{
+    [TestFixture]
+    public class DikeAssessmentSectionNodePresenterTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Assert
+            Assert.IsInstanceOf<ITreeNodePresenter>(nodePresenter);
+            Assert.IsNull(nodePresenter.TreeView);
+            Assert.AreEqual(typeof(DikeAssessmentSection), nodePresenter.NodeTagType);
+        }
+
+        [Test]
+        public void UpdateNode_WithData_InitializeNode()
+        {
+            // Setup
+            const string projectName = "<Insert Project Name Here>";
+
+            var mocks = new MockRepository();
+            var projectNode = mocks.Stub<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            var assessmentSection = new DikeAssessmentSection
+            {
+                Name = projectName
+            };
+
+            // Call
+            nodePresenter.UpdateNode(null, projectNode, assessmentSection);
+
+            // Assert
+            Assert.AreEqual(projectName, projectNode.Text);
+            Assert.AreEqual(16, projectNode.Image.Height);
+            Assert.AreEqual(16, projectNode.Image.Width);
+        }
+
+        [Test]
+        public void GetChildNodeObjects_WithPipingFailureMechanism_ReturnPipingFailureMechanism()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            var assessmentSection = new DikeAssessmentSection();
+
+            // Call
+            var children = nodePresenter.GetChildNodeObjects(assessmentSection, nodeMock).Cast<object>().AsList();
+
+            // Assert
+            Assert.AreEqual(1, children.Count);
+            Assert.AreSame(assessmentSection.PipingFailureMechanism, children[0]);
+            mocks.VerifyAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void CanRenameNode_Always_ReturnTrue()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            var renameAllowed = nodePresenter.CanRenameNode(nodeMock);
+
+            // Assert
+            Assert.IsTrue(renameAllowed);
+            mocks.VerifyAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void CanRenameNodeTo_Always_ReturnTrue()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            var renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, "<Insert New Name Here>");
+
+            // Assert
+            Assert.IsTrue(renameAllowed);
+            mocks.ReplayAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void OnNodeRenamed_WithData_SetProjectNameWithNotification()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSectionObserver = mocks.StrictMock<IObserver>();
+            assessmentSectionObserver.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            var assessmentSection = new DikeAssessmentSection();
+            assessmentSection.Attach(assessmentSectionObserver);
+
+            // Call
+            const string newName = "New Name";
+            nodePresenter.OnNodeRenamed(assessmentSection, newName);
+
+            // Assert
+            Assert.AreEqual(newName, assessmentSection.Name);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void OnNodeChecked_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            nodePresenter.OnNodeChecked(nodeMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on tree node
+        }
+
+        [Test]
+        public void CanDrag_Always_ReturnNone()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            DragOperations dragAllowed = nodePresenter.CanDrag(dataMock);
+
+            // Assert
+            Assert.AreEqual(DragOperations.None, dragAllowed);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CanDrop_Always_ReturnNone()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var sourceMock = mocks.StrictMock<ITreeNode>();
+            var targetMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            DragOperations dropAllowed = nodePresenter.CanDrop(dataMock, sourceMock, targetMock, DragOperations.Move);
+
+            // Assert
+            Assert.AreEqual(DragOperations.None, dropAllowed);
+            mocks.VerifyAll(); // Expect no calls on mocks.
+        }
+
+        [Test]
+        public void CanInsert_Always_ReturnFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var sourceMock = mocks.StrictMock<ITreeNode>();
+            var targetMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            bool insertionAllowed = nodePresenter.CanInsert(dataMock, sourceMock, targetMock);
+
+            // Assert
+            Assert.IsFalse(insertionAllowed);
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnDragDrop_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var sourceParentNodeMock = mocks.StrictMock<ITreeNode>();
+            var targetParentNodeDataMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            nodePresenter.OnDragDrop(dataMock, sourceParentNodeMock, targetParentNodeDataMock, DragOperations.Move, 2);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnNodeSelected_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            nodePresenter.OnNodeSelected(dataMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void GetContextMenu_Always_ReturnsNull()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var assessmentSection = new DikeAssessmentSection();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            var contextMenu = nodePresenter.GetContextMenu(nodeMock, assessmentSection);
+
+            // Assert
+            Assert.IsNull(contextMenu);
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnPropertyChange_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var eventArgsMock = mocks.StrictMock<PropertyChangedEventArgs>("");
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            nodePresenter.OnPropertyChanged(dataMock, nodeMock, eventArgsMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void OnCollectionChange_Always_DoNothing()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            nodePresenter.OnCollectionChanged(dataMock, eventArgsMock);
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void CanRemove_Always_ReturnTrue()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var dataMock = mocks.StrictMock<object>();
+            var nodeMock = mocks.StrictMock<ITreeNode>();
+            mocks.ReplayAll();
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            bool removalAllowed = nodePresenter.CanRemove(dataMock, nodeMock);
+
+            // Assert
+            Assert.IsTrue(removalAllowed);
+            mocks.VerifyAll(); // Expect no calls on arguments
+        }
+
+        [Test]
+        public void RemoveNodeData_ProjectWithAssessmentSection_ReturnTrueAndRemoveAssessmentSection()
+        {
+            // Setup
+            var mocks = new MockRepository();
+
+            var observerMock = mocks.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+
+            mocks.ReplayAll();
+
+            var assessmentSection = new DikeAssessmentSection();
+
+            var project = new Project();
+            project.Items.Add(assessmentSection);
+            project.Attach(observerMock);
+
+            var nodePresenter = new DikeAssessmentSectionNodePresenter();
+
+            // Call
+            bool removalSuccesful = nodePresenter.RemoveNodeData(project, assessmentSection);
+
+            // Assert
+            Assert.IsTrue(removalSuccesful);
+            CollectionAssert.DoesNotContain(project.Items, assessmentSection);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag ca87cfba59d1e35ba9a281b92e5e90f8c8121db0 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DikeAssessmentSectionPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DikeAssessmentSectionPropertiesTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DikeAssessmentSectionPropertiesTest.cs	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -0,0 +1,72 @@
+using Core.Common.Base;
+using Core.Common.Gui;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.PropertyClasses;
+
+namespace Ringtoets.Integration.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class DikeAssessmentSectionPropertiesTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var properties = new DikeAssessmentSectionProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ObjectProperties<DikeAssessmentSection>>(properties);
+            Assert.IsNull(properties.Data);
+        }
+
+        [Test]
+        public void GetProperties_WithData_ReturnExpectedValues()
+        {
+            // Setup
+            var assessmentSection = new DikeAssessmentSection
+            {
+                Name = "Test"
+            };
+
+            var properties = new DikeAssessmentSectionProperties
+            {
+                Data = assessmentSection
+            };
+
+            // Call & Assert
+            Assert.AreEqual(assessmentSection.Name, properties.Name);
+        }
+
+        [Test]
+        public void SetProperties_WithData_UpdateDataAndNotifyObservers()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var projectObserver = mocks.StrictMock<IObserver>();
+            projectObserver.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
+            var assessmentSection = new DikeAssessmentSection();
+            assessmentSection.Attach(projectObserver);
+
+            var properties = new DikeAssessmentSectionProperties
+            {
+                Data = assessmentSection
+            };
+
+            const string newName = "Test";
+
+            // Call
+            properties.Name = newName;
+
+            // Assert
+            Assert.AreEqual(newName, assessmentSection.Name);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r29573f70a58e541743a83a5c5c0d2d4febb7ff1c -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 29573f70a58e541743a83a5c5c0d2d4febb7ff1c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -57,9 +57,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="NodePresenters\AssessmentSectionNodePresenterTest.cs" />
+    <Compile Include="NodePresenters\DikeAssessmentSectionNodePresenterTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyClasses\AssessmentSectionPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\DikeAssessmentSectionPropertiesTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs	(.../PipingCalculationInputsNodePresenter.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs	(.../PipingCalculationInputsNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -5,6 +5,7 @@
 using Core.Common.Controls;
 
 using Ringtoets.Common.Forms.Extensions;
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Service;
 
@@ -17,7 +18,7 @@
     /// This class presents the data on <see cref="PipingData"/> as a node in a <see cref="ITreeView"/> and
     /// implements the way the user can interact with the node.
     /// </summary>
-    public class PipingCalculationInputsNodePresenter : PipingNodePresenterBase<PipingCalculationInputs>
+    public class PipingCalculationInputsNodePresenter : RingtoetsNodePresenterBase<PipingCalculationInputs>
     {
         /// <summary>
         /// Injection points for a method to cause an <see cref="IActivity"/> to be scheduled for execution.
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -6,6 +6,7 @@
 using Core.Common.Controls;
 
 using Ringtoets.Common.Forms.Extensions;
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Helpers;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -18,7 +19,7 @@
     /// This class presents the data on <see cref="PipingFailureMechanism"/> as a node in a 
     /// <see cref="ITreeView"/> and implements the way the user can interact with the node.
     /// </summary>
-    public class PipingFailureMechanismNodePresenter : PipingNodePresenterBase<PipingFailureMechanism>
+    public class PipingFailureMechanismNodePresenter : RingtoetsNodePresenterBase<PipingFailureMechanism>
     {
         /// <summary>
         /// Injection points for a method to cause an <see cref="IActivity"/> to be scheduled for execution.
Fisheye: Tag ca87cfba59d1e35ba9a281b92e5e90f8c8121db0 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingNodePresenterBase.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs
===================================================================
diff -u -r7c544bdc0a35c6f193d1e786b8c001e9977c50d1 -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs	(.../PipingOutputNodePresenter.cs)	(revision 7c544bdc0a35c6f193d1e786b8c001e9977c50d1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs	(.../PipingOutputNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -1,11 +1,13 @@
 using Core.Common.Controls;
+
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Properties;
 
 namespace Ringtoets.Piping.Forms.NodePresenters
 {
-    public class PipingOutputNodePresenter : PipingNodePresenterBase<PipingOutput>
+    public class PipingOutputNodePresenter : RingtoetsNodePresenterBase<PipingOutput>
     {
         protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, PipingOutput nodeData)
         {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileCollectionNodePresenter.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileCollectionNodePresenter.cs	(.../PipingSoilProfileCollectionNodePresenter.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileCollectionNodePresenter.cs	(.../PipingSoilProfileCollectionNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -7,6 +7,7 @@
 using Core.Common.Controls;
 
 using Ringtoets.Common.Forms.Extensions;
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 
@@ -16,7 +17,7 @@
     /// Tree node presenter representing the collection of <see cref="PipingSoilProfile"/> available for piping
     /// calculations.
     /// </summary>
-    public class PipingSoilProfileCollectionNodePresenter : PipingNodePresenterBase<IEnumerable<PipingSoilProfile>>
+    public class PipingSoilProfileCollectionNodePresenter : RingtoetsNodePresenterBase<IEnumerable<PipingSoilProfile>>
     {
         /// <summary>
         /// Sets the action to be performed when importing <see cref="PipingSoilProfile"/> instances
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileNodePresenter.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileNodePresenter.cs	(.../PipingSoilProfileNodePresenter.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSoilProfileNodePresenter.cs	(.../PipingSoilProfileNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -1,10 +1,12 @@
 using Core.Common.Controls;
+
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 
 namespace Ringtoets.Piping.Forms.NodePresenters
 {
-    public class PipingSoilProfileNodePresenter : PipingNodePresenterBase<PipingSoilProfile>
+    public class PipingSoilProfileNodePresenter : RingtoetsNodePresenterBase<PipingSoilProfile>
     {
         protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, PipingSoilProfile nodeData)
         {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineCollectionNodePresenter.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineCollectionNodePresenter.cs	(.../PipingSurfaceLineCollectionNodePresenter.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineCollectionNodePresenter.cs	(.../PipingSurfaceLineCollectionNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -1,14 +1,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Utils.Collections;
 
 using Ringtoets.Common.Forms.Extensions;
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 
 using Ringtoets.Piping.Forms.Properties;
@@ -19,100 +18,38 @@
     /// Tree node presenter representing the collection of <see cref="RingtoetsPipingSurfaceLine"/> available for piping
     /// calculations.
     /// </summary>
-    public class PipingSurfaceLineCollectionNodePresenter : ITreeNodePresenter
+    public class PipingSurfaceLineCollectionNodePresenter : RingtoetsNodePresenterBase<IEnumerable<RingtoetsPipingSurfaceLine>>
     {
         /// <summary>
         /// Injects the action to be performed when importing <see cref="RingtoetsPipingSurfaceLine"/>
         /// instances to <see cref="PipingFailureMechanism.SurfaceLines"/>.
         /// </summary>
         public Action ImportSurfaceLinesAction { private get; set; }
 
-        public ITreeView TreeView { get; set; }
-
-        public Type NodeTagType
+        protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, IEnumerable<RingtoetsPipingSurfaceLine> nodeData)
         {
-            get
-            {
-                return typeof(IEnumerable<RingtoetsPipingSurfaceLine>);
-            }
-        }
-
-        public void UpdateNode(ITreeNode parentNode, ITreeNode node, object nodeData)
-        {
-            var data = (IEnumerable<RingtoetsPipingSurfaceLine>)nodeData;
             node.Text = Resources.PipingSurfaceLinesCollection_DisplayName;
-            node.ForegroundColor = data.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText);
+            node.ForegroundColor = nodeData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText);
             node.Image = Resources.FolderIcon;
         }
 
-        public IEnumerable GetChildNodeObjects(object parentNodeData, ITreeNode node)
+        protected override IEnumerable GetChildNodeObjects(IEnumerable<RingtoetsPipingSurfaceLine> nodeData, ITreeNode node)
         {
-            var surfaceLines = (IEnumerable<RingtoetsPipingSurfaceLine>) parentNodeData;
-            foreach (var pipingSurfaceLine in surfaceLines)
+            foreach (var pipingSurfaceLine in nodeData)
             {
                 yield return pipingSurfaceLine;
             }
         }
 
-        public bool CanRenameNode(ITreeNode node)
+        protected override ContextMenuStrip GetContextMenu(ITreeNode sender, IEnumerable<RingtoetsPipingSurfaceLine> nodeData)
         {
-            return false;
-        }
-
-        public bool CanRenameNodeTo(ITreeNode node, string newName)
-        {
-            return false;
-        }
-
-        public void OnNodeRenamed(object nodeData, string newName)
-        {
-            throw new InvalidOperationException(string.Format(Resources.PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__, GetType().Name));
-        }
-
-        public void OnNodeChecked(ITreeNode node) {}
-
-        public DragOperations CanDrag(object nodeData)
-        {
-            return DragOperations.None;
-        }
-
-        public DragOperations CanDrop(object item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations)
-        {
-            return DragOperations.None;
-        }
-
-        public bool CanInsert(object item, ITreeNode sourceNode, ITreeNode targetNode)
-        {
-            return false;
-        }
-
-        public void OnDragDrop(object item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position) {}
-
-        public void OnNodeSelected(object nodeData) {}
-
-        public ContextMenuStrip GetContextMenu(ITreeNode sender, object nodeData)
-        {
             if (ImportSurfaceLinesAction != null)
             {
                 return CreateContextMenu();
             }
             return null;
         }
 
-        public void OnPropertyChanged(object sender, ITreeNode node, PropertyChangedEventArgs e) {}
-
-        public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e) {}
-
-        public bool CanRemove(object parentNodeData, object nodeData)
-        {
-            return false;
-        }
-
-        public bool RemoveNodeData(object parentNodeData, object nodeData)
-        {
-            throw new InvalidOperationException(String.Format(Resources.PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__, GetType().Name));
-        }
-
         private ContextMenuStrip CreateContextMenu()
         {
             var rootMenu = new ContextMenuStrip();
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineNodePresenter.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineNodePresenter.cs	(.../PipingSurfaceLineNodePresenter.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineNodePresenter.cs	(.../PipingSurfaceLineNodePresenter.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -1,4 +1,6 @@
 using Core.Common.Controls;
+
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 
 using Ringtoets.Piping.Forms.Properties;
@@ -8,7 +10,7 @@
     /// <summary>
     /// Node presenter for <see cref="RingtoetsPipingSurfaceLine"/> data nodes in the project tree view.
     /// </summary>
-    public class PipingSurfaceLineNodePresenter : PipingNodePresenterBase<RingtoetsPipingSurfaceLine>
+    public class PipingSurfaceLineNodePresenter : RingtoetsNodePresenterBase<RingtoetsPipingSurfaceLine>
     {
         protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, RingtoetsPipingSurfaceLine nodeData)
         {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -730,24 +730,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kan node uit boom van type {0} niet hernoemen..
-        /// </summary>
-        public static string PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__ {
-            get {
-                return ResourceManager.GetString("PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Kan node uit boom van type {0} niet verwijderen..
-        /// </summary>
-        public static string PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__ {
-            get {
-                return ResourceManager.GetString("PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Piping resultaat.
         /// </summary>
         public static string PipingOutput_DisplayName {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -469,10 +469,4 @@
   <data name="ShiftedLognormalDistribution_ShortName" xml:space="preserve">
     <value>Verschoven lognormaal</value>
   </data>
-  <data name="PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__" xml:space="preserve">
-    <value>Kan node uit boom van type {0} niet hernoemen.</value>
-  </data>
-  <data name="PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__" xml:space="preserve">
-    <value>Kan node uit boom van type {0} niet verwijderen.</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -62,7 +62,6 @@
     </Compile>
     <Compile Include="Helpers\NamingHelper.cs" />
     <Compile Include="NodePresenters\PipingFailureMechanismNodePresenter.cs" />
-    <Compile Include="NodePresenters\PipingNodePresenterBase.cs" />
     <Compile Include="NodePresenters\PipingOutputNodePresenter.cs" />
     <Compile Include="NodePresenters\PipingCalculationInputsNodePresenter.cs" />
     <Compile Include="NodePresenters\PipingSoilProfileCollectionNodePresenter.cs" />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs
===================================================================
diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs	(.../PipingCalculationInputsNodePresenterTest.cs)	(revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs	(.../PipingCalculationInputsNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -439,7 +439,7 @@
 
             // Assert
             var exception = Assert.Throws<InvalidOperationException>(removeAction);
-            var expectedMessage = string.Format("Kan node uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name);
+            var expectedMessage = string.Format("Kan knoop uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name);
             Assert.AreEqual(expectedMessage, exception.Message);
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -141,7 +141,7 @@
 
             // Assert
             var exception = Assert.Throws<InvalidOperationException>(call);
-            var expectedMessage = string.Format("Kan node uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name);
+            var expectedMessage = string.Format("Kan knoop uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name);
             Assert.AreEqual(expectedMessage, exception.Message);
             mocks.ReplayAll(); // Expect no calls on tree node
         }
Fisheye: Tag ca87cfba59d1e35ba9a281b92e5e90f8c8121db0 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingNodePresenterBaseTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs
===================================================================
diff -u -r2a49b7243807fe0b95136efd55652201164a6c74 -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs	(.../PipingSoilProfileNodePresenterTest.cs)	(revision 2a49b7243807fe0b95136efd55652201164a6c74)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileNodePresenterTest.cs	(.../PipingSoilProfileNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -3,6 +3,8 @@
 using Core.Common.Controls;
 using NUnit.Framework;
 using Rhino.Mocks;
+
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.NodePresenters;
 
@@ -19,7 +21,7 @@
             var nodePresenter = new PipingSoilProfileNodePresenter();
 
             // Assert
-            Assert.IsInstanceOf<PipingNodePresenterBase<PipingSoilProfile>>(nodePresenter);
+            Assert.IsInstanceOf<RingtoetsNodePresenterBase<PipingSoilProfile>>(nodePresenter);
             Assert.IsInstanceOf<PipingSoilProfileNodePresenter>(nodePresenter);
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs
===================================================================
diff -u -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -140,17 +140,17 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var nodeMock = mocks.StrictMock<ITreeNode>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter();
 
             // Call
-            TestDelegate call = () => { nodePresenter.OnNodeRenamed(nodeMock, "<Insert New Name Here>"); };
+            TestDelegate call = () => { nodePresenter.OnNodeRenamed(dataMock, "<Insert New Name Here>"); };
 
             // Assert
             var exception = Assert.Throws<InvalidOperationException>(call);
-            var expectedMessage = string.Format("Kan node uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name);
+            var expectedMessage = string.Format("Kan knoop uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name);
             Assert.AreEqual(expectedMessage, exception.Message);
             mocks.ReplayAll(); // Expect no calls on tree node
         }
@@ -177,7 +177,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter();
@@ -195,7 +195,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var sourceMock = mocks.StrictMock<ITreeNode>();
             var targetMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
@@ -215,7 +215,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var sourceMock = mocks.StrictMock<ITreeNode>();
             var targetMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
@@ -235,7 +235,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var sourceParentNodeMock = mocks.StrictMock<ITreeNode>();
             var targetParentNodeDataMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
@@ -254,7 +254,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter();
@@ -272,7 +272,7 @@
             // Setup
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter
@@ -294,7 +294,7 @@
             // Setup
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var actionStub = mocks.Stub<Action>();
             mocks.ReplayAll();
 
@@ -321,7 +321,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var eventArgsMock = mocks.StrictMock<PropertyChangedEventArgs>("");
             mocks.ReplayAll();
@@ -340,7 +340,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
             mocks.ReplayAll();
 
@@ -358,14 +358,14 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<object>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter();
 
             // Call
-            bool removalAllowed = nodePresenter.CanRemove(dataMock, nodeMock);
+            bool removalAllowed = nodePresenter.CanRemove(nodeMock, dataMock);
 
             // Assert
             Assert.IsFalse(removalAllowed);
@@ -378,17 +378,17 @@
             // setup
             var mocks = new MockRepository();
             var parentNodeDataMock = mocks.StrictMock<object>();
-            var nodeDataMock = mocks.StrictMock<ITreeNode>();
+            var dataMock = mocks.StrictMock<IEnumerable<RingtoetsPipingSurfaceLine>>();
             mocks.ReplayAll();
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter();
 
             // call
-            TestDelegate call = () => nodePresenter.RemoveNodeData(parentNodeDataMock, nodeDataMock);
+            TestDelegate call = () => nodePresenter.RemoveNodeData(parentNodeDataMock, dataMock);
 
             // assert
             var exception = Assert.Throws<InvalidOperationException>(call);
-            var expectedMessage = string.Format("Kan node uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name);
+            var expectedMessage = string.Format("Kan knoop uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name);
             Assert.AreEqual(expectedMessage, exception.Message);
             mocks.VerifyAll(); // Expect no calls on arguments
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs	(.../PipingSurfaceLineNodePresenterTest.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineNodePresenterTest.cs	(.../PipingSurfaceLineNodePresenterTest.cs)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -3,6 +3,7 @@
 
 using Rhino.Mocks;
 
+using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Piping.Data;
 
 using Ringtoets.Piping.Forms.NodePresenters;
@@ -19,7 +20,7 @@
             var nodePresenter = new PipingSurfaceLineNodePresenter();
 
             // Assert
-            Assert.IsInstanceOf<PipingNodePresenterBase<RingtoetsPipingSurfaceLine>>(nodePresenter);
+            Assert.IsInstanceOf<RingtoetsNodePresenterBase<RingtoetsPipingSurfaceLine>>(nodePresenter);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r31d7b5552adb7b89eaf1552855f88c5df887e4f9 -rca87cfba59d1e35ba9a281b92e5e90f8c8121db0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 31d7b5552adb7b89eaf1552855f88c5df887e4f9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision ca87cfba59d1e35ba9a281b92e5e90f8c8121db0)
@@ -59,7 +59,6 @@
     <Compile Include="NodePresenters\PipingCalculationInputsNodePresenterTest.cs" />
     <Compile Include="Helper\PipingOutputCreator.cs" />
     <Compile Include="NodePresenters\PipingFailureMechanismNodePresenterTest.cs" />
-    <Compile Include="NodePresenters\PipingNodePresenterBaseTest.cs" />
     <Compile Include="NodePresenters\PipingOutputNodePresenterTest.cs" />
     <Compile Include="NodePresenters\PipingSoilProfileNodePresenterTest.cs" />
     <Compile Include="NodePresenters\PipingSurfaceLineCollectionNodePresenterTest.cs" />
@@ -108,6 +107,10 @@
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
       <Name>Core.Common.TestUtils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj">
+      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
+      <Name>Ringtoets.Common.Forms</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Piping.Calculation\Ringtoets.Piping.Calculation.csproj">
       <Project>{d64e4f0e-e341-496f-82b2-941ad202b4e3}</Project>
       <Name>Ringtoets.Piping.Calculation</Name>