Index: Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs
===================================================================
diff -u -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs	(.../TreeViewContextMenuItemFactory.cs)	(revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/TreeViewContextMenuItemFactory.cs	(.../TreeViewContextMenuItemFactory.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Gui.Properties;
@@ -35,10 +37,12 @@
         /// <returns>The created <see cref="ToolStripItem"/>.</returns>
         public ToolStripItem CreateExpandAllItem()
         {
+            IList<ITreeNode> children = treeNode.Nodes;
             var toolStripMenuItem = new ToolStripMenuItem(Resources.Expand_all)
             {
                 ToolTipText = Resources.Expand_all_ToolTip,
-                Image = Resources.ExpandAllIcon
+                Image = Resources.ExpandAllIcon,
+                Enabled = children != null && children.Any()
             };
             toolStripMenuItem.Click += (s, e) => treeNode.TreeView.ExpandAll(treeNode);
             return toolStripMenuItem;
@@ -51,10 +55,12 @@
         /// <returns>The created <see cref="ToolStripItem"/>.</returns>
         public ToolStripItem CreateCollapseAllItem()
         {
+            IList<ITreeNode> children = treeNode.Nodes;
             var toolStripMenuItem = new ToolStripMenuItem(Resources.Collapse_all)
             {
                 ToolTipText = Resources.Collapse_all_ToolTip,
-                Image = Resources.CollapseAllIcon
+                Image = Resources.CollapseAllIcon,
+                Enabled = children != null && children.Any()
             };
             toolStripMenuItem.Click += (s, e) => treeNode.TreeView.CollapseAll(treeNode);
             return toolStripMenuItem;
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls;
@@ -80,38 +81,60 @@
             Assert.AreEqual(1, result.Items.Count);
 
             TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Delete, Resources.Delete_ToolTip, Resources.DeleteIcon);
-        } 
+        }
 
         [Test]
-        public void AddExpandAllItem_WhenBuild_ItemAddedToContextMenu()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void AddExpandAllItem_WhenBuild_ItemAddedToContextMenu(bool enabled)
         {
             // Setup
-            var builder = new ContextMenuBuilder(null, MockRepository.GenerateMock<ITreeNode>());
+            var treeNodeMock = mocks.StrictMock<ITreeNode>();
+            IList<ITreeNode> childs = new List<ITreeNode>();
+            if (enabled)
+            {
+                childs.Add(treeNodeMock);
+            }
+            treeNodeMock.Expect(tn => tn.Nodes).Return(childs);
+            var builder = new ContextMenuBuilder(null, treeNodeMock);
 
+            mocks.ReplayAll();
+
             // Call
             var result = builder.AddExpandAllItem().Build();
 
             // Assert
             Assert.IsInstanceOf<ContextMenuStrip>(result);
             Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Expand_all, Resources.Expand_all_ToolTip, Resources.ExpandAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Expand_all, Resources.Expand_all_ToolTip, Resources.ExpandAllIcon, enabled);
         } 
 
         [Test]
-        public void AddCollapseAllItem_WhenBuild_ItemAddedToContextMenu()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void AddCollapseAllItem_WhenBuild_ItemAddedToContextMenu(bool enabled)
         {
             // Setup
-            var builder = new ContextMenuBuilder(null, MockRepository.GenerateMock<ITreeNode>());
+            var treeNodeMock = mocks.StrictMock<ITreeNode>();
+            IList<ITreeNode> childs = new List<ITreeNode>();
+            if (enabled)
+            {
+                childs.Add(treeNodeMock);
+            }
+            treeNodeMock.Expect(tn => tn.Nodes).Return(childs);
+            var builder = new ContextMenuBuilder(null, treeNodeMock);
 
+            mocks.ReplayAll();
+
             // Call
             var result = builder.AddCollapseAllItem().Build();
 
             // Assert
             Assert.IsInstanceOf<ContextMenuStrip>(result);
             Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Collapse_all, Resources.Collapse_all_ToolTip, Resources.CollapseAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Collapse_all, Resources.Collapse_all_ToolTip, Resources.CollapseAllIcon, enabled);
         }
 
         [Test]
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Core.Common.Controls;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Properties;
@@ -42,14 +43,27 @@
         }
 
         [Test]
-        public void CreateExpandAllItem_Always_ItemWithExpandFunction()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void CreateExpandAllItem_DependingOnChildNodes_ItemWithExpandFunctionWillBeEnabled(bool enabled)
         {
             // Setup
             var treeNodeMock = mocks.StrictMock<ITreeNode>();
             var treeViewMock = mocks.StrictMock<ITreeView>();
-            treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
-            treeViewMock.Expect(tv => tv.ExpandAll(treeNodeMock));
+            if (enabled)
+            {
+                treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
+                treeViewMock.Expect(tv => tv.ExpandAll(treeNodeMock));
+            }
 
+            var children = new List<ITreeNode>();
+
+            if (enabled)
+            {
+                children.Add(mocks.StrictMock<ITreeNode>());
+            }
+
+            treeNodeMock.Expect(tn => tn.Nodes).Return(children);
             mocks.ReplayAll();
 
             var factory = new TreeViewContextMenuItemFactory(treeNodeMock);
@@ -59,22 +73,36 @@
             item.PerformClick();
 
             // Assert
-            Assert.AreEqual(item.Text, Resources.Expand_all);
-            Assert.AreEqual(item.ToolTipText, Resources.Expand_all_ToolTip);
-            TestHelper.AssertImagesAreEqual(item.Image, Resources.ExpandAllIcon);
+            Assert.AreEqual(Resources.Expand_all, item.Text);
+            Assert.AreEqual(Resources.Expand_all_ToolTip, item.ToolTipText);
+            TestHelper.AssertImagesAreEqual(Resources.ExpandAllIcon, item.Image);
+            Assert.AreEqual(enabled, item.Enabled);
 
             mocks.VerifyAll();
         }
 
         [Test]
-        public void CreateCollapseAllItem_Always_ItemWithCollapseFunction()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void CreateCollapseAllItem_DependingOnChildNodes_ItemWithCollapseFunctionWillBeEnabled(bool enabled)
         {
             // Setup
             var treeNodeMock = mocks.StrictMock<ITreeNode>();
             var treeViewMock = mocks.StrictMock<ITreeView>();
-            treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
-            treeViewMock.Expect(tv => tv.CollapseAll(treeNodeMock));
+            if (enabled)
+            {
+                treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
+                treeViewMock.Expect(tv => tv.CollapseAll(treeNodeMock));
+            }
+            var children = new List<ITreeNode>();
 
+            if (enabled)
+            {
+                children.Add(mocks.StrictMock<ITreeNode>());
+            }
+
+            treeNodeMock.Expect(tn => tn.Nodes).Return(children);
+
             mocks.ReplayAll();
 
             var factory = new TreeViewContextMenuItemFactory(treeNodeMock);
@@ -84,9 +112,10 @@
             item.PerformClick();
 
             // Assert
-            Assert.AreEqual(item.Text, Resources.Collapse_all);
-            Assert.AreEqual(item.ToolTipText, Resources.Collapse_all_ToolTip);
-            TestHelper.AssertImagesAreEqual(item.Image, Resources.CollapseAllIcon);
+            Assert.AreEqual(Resources.Collapse_all, item.Text);
+            Assert.AreEqual(Resources.Collapse_all_ToolTip, item.ToolTipText);
+            TestHelper.AssertImagesAreEqual(Resources.CollapseAllIcon, item.Image);
+            Assert.AreEqual(enabled, item.Enabled);
 
             mocks.VerifyAll();
         }
Index: Core/Common/test/Core.Common.Gui.TestUtils/TestContextMenuBuilderProvider.cs
===================================================================
diff -u -reff8c57b5a5243e2c723f117b46bf8b4094ca4c6 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Common/test/Core.Common.Gui.TestUtils/TestContextMenuBuilderProvider.cs	(.../TestContextMenuBuilderProvider.cs)	(revision eff8c57b5a5243e2c723f117b46bf8b4094ca4c6)
+++ Core/Common/test/Core.Common.Gui.TestUtils/TestContextMenuBuilderProvider.cs	(.../TestContextMenuBuilderProvider.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Core.Common.Controls;
 using Core.Common.Gui.ContextMenu;
 using Rhino.Mocks;
@@ -17,6 +18,8 @@
         /// <param name="node">The <see cref="ITreeNode"/> to pass to the <see cref="ContextMenuBuilder"/>.</param>
         /// <param name="itemsEnabled">Value indicating whether following option should be available.
         /// <list type="bullet">
+        /// <item>collapse all</item>
+        /// <item>expand all</item>
         /// <item>export</item>
         /// <item>import</item>
         /// <item>show properties</item>
@@ -37,6 +40,13 @@
             commandHandlerMock.Expect(ch => ch.CanShowPropertiesForGuiSelection()).Return(itemsEnabled).Repeat.Any();
             commandHandlerMock.Expect(ch => ch.CanOpenDefaultViewForSelection()).Return(itemsEnabled).Repeat.Any();
 
+            var childs = new List<ITreeNode>();
+            if (itemsEnabled)
+            {
+                childs.Add(node);
+            }
+            node.Expect(n => n.Nodes).Return(childs).Repeat.Any();
+
             menuBuilderProviderMock.Expect(mbp => mbp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(commandHandlerMock, node));
             return menuBuilderProviderMock;
         }
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs
===================================================================
diff -u -r3d6a1ac25ce195c4fc5fac791d4db2c0b7bf0260 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3d6a1ac25ce195c4fc5fac791d4db2c0b7bf0260)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -71,7 +71,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nieuwe &amp;Item....
+        ///   Looks up a localized string similar to Nieuw &amp;item....
         /// </summary>
         public static string AddItem {
             get {
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx
===================================================================
diff -u -r3d6a1ac25ce195c4fc5fac791d4db2c0b7bf0260 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx	(.../Resources.resx)	(revision 3d6a1ac25ce195c4fc5fac791d4db2c0b7bf0260)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx	(.../Resources.resx)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -413,7 +413,7 @@
     <value>..\Resources\table-import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="AddItem" xml:space="preserve">
-    <value>Nieuwe &amp;Item...</value>
+    <value>Nieuw &amp;item...</value>
   </data>
   <data name="Rename" xml:space="preserve">
     <value>&amp;Hernoemen</value>
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/NodePresenters/ProjectNodePresenterTest.cs
===================================================================
diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/NodePresenters/ProjectNodePresenterTest.cs	(.../ProjectNodePresenterTest.cs)	(revision 1f79b34c12554e2b9878f6296168d18232cc9852)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/NodePresenters/ProjectNodePresenterTest.cs	(.../ProjectNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,5 @@
-using System.Windows.Forms;
+using System.Collections.Generic;
+using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Controls;
@@ -59,8 +60,8 @@
             Assert.AreEqual(9, result.Items.Count);
 
             TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.AddItem, null, Resources.plus);
-            TestHelper.AssertContextMenuStripContainsItem(result, 2, CommonGuiResources.Expand_all, CommonGuiResources.Expand_all_ToolTip, CommonGuiResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(result, 3, CommonGuiResources.Collapse_all, CommonGuiResources.Collapse_all_ToolTip, CommonGuiResources.CollapseAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(result, 2, CommonGuiResources.Expand_all, CommonGuiResources.Expand_all_ToolTip, CommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(result, 3, CommonGuiResources.Collapse_all, CommonGuiResources.Collapse_all_ToolTip, CommonGuiResources.CollapseAllIcon, commonItemsEnabled);
             TestHelper.AssertContextMenuStripContainsItem(result, 5, CommonGuiResources.Import, CommonGuiResources.Import_ToolTip, CommonGuiResources.ImportIcon, commonItemsEnabled);
             TestHelper.AssertContextMenuStripContainsItem(result, 6, CommonGuiResources.Export, CommonGuiResources.Export_ToolTip, CommonGuiResources.ExportIcon, commonItemsEnabled);
             TestHelper.AssertContextMenuStripContainsItem(result, 8, CommonGuiResources.Properties, CommonGuiResources.Properties_ToolTip, CommonGuiResources.PropertiesIcon, commonItemsEnabled);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs
===================================================================
diff -u -rf9a6da5a0a62e484e46775cc57ee6f8fe412694f -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision f9a6da5a0a62e484e46775cc57ee6f8fe412694f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/NodePresenters/CategoryTreeFolderNodePresenterTest.cs	(.../CategoryTreeFolderNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -6,6 +6,7 @@
 using Core.Common.Controls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.TestUtils;
 using Core.Common.TestUtils;
 
 using NUnit.Framework;
@@ -16,6 +17,7 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 
 using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Common.Forms.Test.NodePresenters
 {
@@ -124,38 +126,30 @@
         }
 
         [Test]
-        public void GetContextMenu_ContextMenuBuilderProviderSet_HaveImportSurfaceLinesItemInContextMenu()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetContextMenu_ContextMenuBuilderProviderSet_HaveImportSurfaceLinesItemInContextMenu(bool commonItemsEnabled)
         {
             // Setup
             var folder = new CategoryTreeFolder("", new object[0]);
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
-            var menuBuilderProviderMock = mocks.StrictMock<IContextMenuBuilderProvider>();
-            menuBuilderProviderMock.Expect(mbp => mbp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
 
-            mocks.ReplayAll();
-
             var nodePresenter = new CategoryTreeFolderNodePresenter
             {
-                ContextMenuBuilderProvider = menuBuilderProviderMock
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, commonItemsEnabled)
             };
 
+            mocks.ReplayAll();
+
             // Call
             var returnedContextMenu = nodePresenter.GetContextMenu(nodeMock, folder);
 
             // Assert
             Assert.AreEqual(2, returnedContextMenu.Items.Count);
-            var expandAllItem = returnedContextMenu.Items[0];
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Expand_all, expandAllItem.Text);
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Expand_all_ToolTip, expandAllItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(Core.Common.Gui.Properties.Resources.ExpandAllIcon, expandAllItem.Image);
-            Assert.IsTrue(expandAllItem.Enabled);
 
-            var collapseAllItem = returnedContextMenu.Items[1];
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Collapse_all, collapseAllItem.Text);
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Collapse_all_ToolTip, collapseAllItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(Core.Common.Gui.Properties.Resources.CollapseAllIcon, collapseAllItem.Image);
-            Assert.IsTrue(collapseAllItem.Enabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 0, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 1, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, commonItemsEnabled);
 
             mocks.VerifyAll();
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r61f804a9e44dedf9c512646cf488e3761ddefac5 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 61f804a9e44dedf9c512646cf488e3761ddefac5)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -82,6 +82,10 @@
       <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Gui.TestUtils\Core.Common.Gui.TestUtils.csproj">
+      <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
+      <Name>Core.Common.Gui.TestUtils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
       <Name>Core.Common.TestUtils</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 1f79b34c12554e2b9878f6296168d18232cc9852)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -400,7 +401,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var nodePresenter = new AssessmentSectionBaseNodePresenter
             {
-                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, true)
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, commonItemsEnabled)
             };
 
             mocks.ReplayAll();
@@ -412,11 +413,11 @@
             Assert.AreEqual(9, contextMenu.Items.Count);
 
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, CoreCommonGuiResources.Delete, CoreCommonGuiResources.Delete_ToolTip, CoreCommonGuiResources.DeleteIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 5, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 6, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 8, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesIcon);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 5, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 6, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 8, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesIcon, commonItemsEnabled);
 
             Assert.IsInstanceOf<ToolStripSeparator>(contextMenu.Items[1]);
             Assert.IsInstanceOf<ToolStripSeparator>(contextMenu.Items[4]);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs
===================================================================
diff -u -r5bdfe106fefb36f7e677da7e75afec1eba7eedd3 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs	(.../FailureMechanismNodePresenterTest.cs)	(revision 5bdfe106fefb36f7e677da7e75afec1eba7eedd3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/FailureMechanismNodePresenterTest.cs	(.../FailureMechanismNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,10 +1,12 @@
-using System.Drawing;
+using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.TestUtils;
 using Core.Common.TestUtils;
 
 using NUnit.Framework;
@@ -139,10 +141,18 @@
         }
 
         [Test]
-        public void GetContextMenu_NoGuiCommandHandler_ReturnsContextMenuWithItems()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetContextMenu_NoGuiCommandHandler_ReturnsContextMenuWithItems(bool commonItemsEnabled)
         {
             // Setup
             var nodeMock = mocks.StrictMock<ITreeNode>();
+            var childs = new List<ITreeNode>();
+            if (commonItemsEnabled)
+            {
+                childs.Add(nodeMock);
+            }
+            nodeMock.Expect(n => n.Nodes).Return(childs).Repeat.Any();
             var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
             contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
 
@@ -159,25 +169,23 @@
 
             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, CommonResources.Expand_all, CommonResources.Expand_all_ToolTip, CommonResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 4, CommonResources.Collapse_all, CommonResources.Collapse_all_ToolTip, CommonResources.CollapseAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 3, CommonResources.Expand_all, CommonResources.Expand_all_ToolTip, CommonResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 4, CommonResources.Collapse_all, CommonResources.Collapse_all_ToolTip, CommonResources.CollapseAllIcon, commonItemsEnabled);
 
             CollectionAssert.AllItemsAreInstancesOfType(new []{menu.Items[2], menu.Items[5]}, typeof(ToolStripSeparator));
 
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GetContextMenu_WithGuiCommandHandler_ReturnsContextMenuWithCommonItems()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetContextMenu_WithGuiCommandHandler_ReturnsContextMenuWithCommonItems(bool commonItemsEnabled)
         {
             // Setup
             var nodeMock = mocks.Stub<ITreeNode>();
-            var guiHandlerMock = mocks.DynamicMock<IGuiCommandHandler>();
-
-            var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
-            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(guiHandlerMock, nodeMock));
-
-            var nodePresenter = new FailureMechanismNodePresenter(contextMenuProvider);
+            
+            var nodePresenter = new FailureMechanismNodePresenter(TestContextMenuBuilderProvider.Create(mocks, nodeMock, commonItemsEnabled));
             var failureMechanism = new FailureMechanismPlaceholder("test");
             nodeMock.Tag = failureMechanism;
 
@@ -191,11 +199,11 @@
 
             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, CommonResources.Expand_all, CommonResources.Expand_all_ToolTip, CommonResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 4, CommonResources.Collapse_all, CommonResources.Collapse_all_ToolTip, CommonResources.CollapseAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 6, CommonResources.Import, CommonResources.Import_ToolTip, CommonResources.ImportIcon, false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 7, CommonResources.Export, CommonResources.Export_ToolTip, CommonResources.ExportIcon, false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 9, CommonResources.Properties, CommonResources.Properties_ToolTip, CommonResources.PropertiesIcon, false);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 3, CommonResources.Expand_all, CommonResources.Expand_all_ToolTip, CommonResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 4, CommonResources.Collapse_all, CommonResources.Collapse_all_ToolTip, CommonResources.CollapseAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 6, CommonResources.Import, CommonResources.Import_ToolTip, CommonResources.ImportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 7, CommonResources.Export, CommonResources.Export_ToolTip, CommonResources.ExportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 9, CommonResources.Properties, CommonResources.Properties_ToolTip, CommonResources.PropertiesIcon, commonItemsEnabled);
 
             CollectionAssert.AllItemsAreInstancesOfType(new []{menu.Items[2]}, typeof(ToolStripSeparator));
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs
===================================================================
diff -u -r4fde87e9b64c21a70b06ff295fd34cc1932fe72a -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 4fde87e9b64c21a70b06ff295fd34cc1932fe72a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs	(.../PipingCalculationContextNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
@@ -362,8 +363,8 @@
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex, PipingFormsResources.Calculate, null, PipingFormsResources.Play);
 
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuDeleteIndex, CoreCommonGuiResources.Delete, CoreCommonGuiResources.Delete_ToolTip, CoreCommonGuiResources.DeleteIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuExpandIndex, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCollapseIndex, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuExpandIndex, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCollapseIndex, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, commonItemsEnabled);
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuImportIndex, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, commonItemsEnabled);
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuExportIndex, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, commonItemsEnabled);
             TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuPropertiesIndex, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesIcon, commonItemsEnabled);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -rb1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision b1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -417,11 +417,12 @@
         }
 
         [Test]
-        public void GetContextMenu_NoGuiCommandHandler_ReturnsEmptyContextMenu()
+        public void GetContextMenu_NoGuiCommandHandler_ReturnsNineItems()
         {
             // Setup
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
+            nodeMock.Expect(n => n.Nodes).Return(new ITreeNode[0]).Repeat.Any();
             var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
             contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
 
@@ -441,8 +442,8 @@
             TestHelper.AssertContextMenuStripContainsItem(menu, 0, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculation, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculation_Tooltip, PipingFormsResources.PipingIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, 1, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculationGroup, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculationGroup_Tooltip, PipingFormsResources.AddFolderIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, 3, RingtoetsFormsResources.Calculate_all, PipingFormsResources.PipingFailureMechanism_Calculate_Tooltip, RingtoetsFormsResources.CalculateAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 6, CommonGuiResources.Expand_all, CommonGuiResources.Expand_all_ToolTip, CommonGuiResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 7, CommonGuiResources.Collapse_all, CommonGuiResources.Collapse_all_ToolTip, CommonGuiResources.CollapseAllIcon);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 6, CommonGuiResources.Expand_all, CommonGuiResources.Expand_all_ToolTip, CommonGuiResources.ExpandAllIcon, false);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 7, CommonGuiResources.Collapse_all, CommonGuiResources.Collapse_all_ToolTip, CommonGuiResources.CollapseAllIcon, false);
 
             CollectionAssert.AllItemsAreInstancesOfType(new[] { menu.Items[2], menu.Items[5], menu.Items[8] }, typeof(ToolStripSeparator));
 
@@ -452,15 +453,15 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void GetContextMenu_WithGui_ReturnsContextMenuWithCommonItems(bool importExportEnabled)
+        public void GetContextMenu_WithGui_ReturnsContextMenuWithCommonItems(bool commonItemsEnabled)
         {
             // Setup
             var mocks = new MockRepository();
             var nodeMock = mocks.Stub<ITreeNode>();
             
             var nodePresenter = new PipingFailureMechanismNodePresenter
             {
-                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, importExportEnabled)
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, commonItemsEnabled)
             };
             var failureMechanism = mocks.StrictMock<PipingFailureMechanism>();
             nodeMock.Tag = failureMechanism;
@@ -476,10 +477,10 @@
             TestHelper.AssertContextMenuStripContainsItem(menu, 0, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculation, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculation_Tooltip, PipingFormsResources.PipingIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, 1, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculationGroup, PipingFormsResources.PipingFailureMechanism_Add_PipingCalculationGroup_Tooltip, PipingFormsResources.AddFolderIcon);
             TestHelper.AssertContextMenuStripContainsItem(menu, 3, RingtoetsFormsResources.Calculate_all, PipingFormsResources.PipingFailureMechanism_Calculate_Tooltip, RingtoetsFormsResources.CalculateAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 6, CommonGuiResources.Expand_all, CommonGuiResources.Expand_all_ToolTip, CommonGuiResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 7, CommonGuiResources.Collapse_all, CommonGuiResources.Collapse_all_ToolTip, CommonGuiResources.CollapseAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 9, CommonGuiResources.Import, CommonGuiResources.Import_ToolTip, CommonGuiResources.ImportIcon, importExportEnabled);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 10, CommonGuiResources.Export, CommonGuiResources.Export_ToolTip, CommonGuiResources.ExportIcon, importExportEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 6, CommonGuiResources.Expand_all, CommonGuiResources.Expand_all_ToolTip, CommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 7, CommonGuiResources.Collapse_all, CommonGuiResources.Collapse_all_ToolTip, CommonGuiResources.CollapseAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 9, CommonGuiResources.Import, CommonGuiResources.Import_ToolTip, CommonGuiResources.ImportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(menu, 10, CommonGuiResources.Export, CommonGuiResources.Export_ToolTip, CommonGuiResources.ExportIcon, commonItemsEnabled);
 
             CollectionAssert.AllItemsAreInstancesOfType(new[] { menu.Items[2], menu.Items[5], menu.Items[8] }, typeof(ToolStripSeparator));
 
@@ -494,6 +495,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
+            nodeMock.Expect(n => n.Nodes).Return(new ITreeNode[0]).Repeat.Any();
             contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
 
             var nodePresenter = new PipingFailureMechanismNodePresenter
@@ -524,6 +526,7 @@
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var dataMock = mocks.StrictMock<PipingFailureMechanism>();
             var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
+            nodeMock.Expect(n => n.Nodes).Return(new ITreeNode[0]).Repeat.Any();
             contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
 
             dataMock.Calculations.Add(new PipingCalculation
@@ -558,19 +561,17 @@
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var observerMock = mocks.StrictMock<IObserver>();
-            var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
 
             observerMock.Expect(o => o.UpdateObserver());
-            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
-            mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
             failureMechanism.Attach(observerMock);
             var nodePresenter = new PipingFailureMechanismNodePresenter
             {
-                ContextMenuBuilderProvider = contextMenuProvider
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, true)
             };
 
+            mocks.ReplayAll();
             // Precondition
             Assert.AreEqual(1, failureMechanism.Calculations.Count);
 
@@ -594,21 +595,20 @@
             var mocks = new MockRepository();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var observerMock = mocks.StrictMock<IObserver>();
-            var contextMenuProvider = mocks.StrictMock<IContextMenuBuilderProvider>();
-
+            
             observerMock.Expect(o => o.UpdateObserver());
-            contextMenuProvider.Expect(cmp => cmp.Get(null)).IgnoreArguments().Return(new ContextMenuBuilder(null, nodeMock));
-            mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
             failureMechanism.Attach(observerMock);
             failureMechanism.Calculations.Clear();
             failureMechanism.Calculations.Add(new PipingCalculationGroup());
             var nodePresenter = new PipingFailureMechanismNodePresenter
             {
-                ContextMenuBuilderProvider = contextMenuProvider
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, true)
             };
 
+            mocks.ReplayAll();
+
             // Precondition
             Assert.AreEqual(1, failureMechanism.Calculations.Count);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs
===================================================================
diff -u -rb1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs	(.../PipingSoilProfileCollectionNodePresenterTest.cs)	(revision b1eb3cb37aaee9ebe020e4a2ca5e9730abfa748a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs	(.../PipingSoilProfileCollectionNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -141,7 +141,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void GetContextMenu_ContextMenuBuilderProviderSet_HaveImportSurfaceLinesItemInContextMenu(bool importExportEnabled)
+        public void GetContextMenu_ContextMenuBuilderProviderSet_HaveImportSurfaceLinesItemInContextMenu(bool commonItemsEnabled)
         {
             // Setup
             var mocks = new MockRepository();
@@ -150,7 +150,7 @@
 
             var nodePresenter = new PipingSoilProfileCollectionNodePresenter
             {
-                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, importExportEnabled)
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, commonItemsEnabled)
             };
 
             mocks.ReplayAll();
@@ -161,10 +161,10 @@
             // Assert
             Assert.AreEqual(5, returnedContextMenu.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 0, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 1, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 3, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, importExportEnabled);
-            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 4, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, importExportEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 0, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 1, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 3, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 4, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, commonItemsEnabled);
 
             Assert.IsInstanceOf<ToolStripSeparator>(returnedContextMenu.Items[2]);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs
===================================================================
diff -u -reff8c57b5a5243e2c723f117b46bf8b4094ca4c6 -r8a40ed604cff5c3d15f997d51e81002ae160487e
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision eff8c57b5a5243e2c723f117b46bf8b4094ca4c6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs	(.../PipingSurfaceLineCollectionNodePresenterTest.cs)	(revision 8a40ed604cff5c3d15f997d51e81002ae160487e)
@@ -5,8 +5,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Gui;
-using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.TestUtils;
 using Core.Common.TestUtils;
 using Core.Common.Utils.Collections;
@@ -18,6 +16,7 @@
 using Ringtoets.Piping.Forms.NodePresenters;
 
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
+using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
@@ -310,7 +309,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void GetContextMenu_ContextMenuBuilderProviderSet_HaveImportSurfaceLinesItemInContextMenu(bool importExportEnabled)
+        public void GetContextMenu_ContextMenuBuilderProviderSet_HaveImportSurfaceLinesItemInContextMenu(bool commonItemsEnabled)
         {
             // Setup
             var mocks = new MockRepository();
@@ -319,7 +318,7 @@
 
             var nodePresenter = new PipingSurfaceLineCollectionNodePresenter
             {
-                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, importExportEnabled)
+                ContextMenuBuilderProvider = TestContextMenuBuilderProvider.Create(mocks, nodeMock, commonItemsEnabled)
             };
 
             mocks.ReplayAll();
@@ -329,30 +328,12 @@
 
             // Assert
             Assert.AreEqual(5, returnedContextMenu.Items.Count);
-            var expandAllItem = returnedContextMenu.Items[0];
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Expand_all, expandAllItem.Text);
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Expand_all_ToolTip, expandAllItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(Core.Common.Gui.Properties.Resources.ExpandAllIcon, expandAllItem.Image);
-            Assert.IsTrue(expandAllItem.Enabled);
 
-            var collapseAllItem = returnedContextMenu.Items[1];
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Collapse_all, collapseAllItem.Text);
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Collapse_all_ToolTip, collapseAllItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(Core.Common.Gui.Properties.Resources.CollapseAllIcon, collapseAllItem.Image);
-            Assert.IsTrue(collapseAllItem.Enabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 0, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 1, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 3, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, commonItemsEnabled);
+            TestHelper.AssertContextMenuStripContainsItem(returnedContextMenu, 4, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, commonItemsEnabled);
 
-            var importItem = returnedContextMenu.Items[3];
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Import, importItem.Text);
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Import_ToolTip, importItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(Core.Common.Gui.Properties.Resources.ImportIcon, importItem.Image);
-            Assert.AreEqual(importExportEnabled, importItem.Enabled);
-
-            var exportItem = returnedContextMenu.Items[4];
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Export, exportItem.Text);
-            Assert.AreEqual(Core.Common.Gui.Properties.Resources.Export_ToolTip, exportItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(Core.Common.Gui.Properties.Resources.ExportIcon, exportItem.Image);
-            Assert.AreEqual(importExportEnabled, exportItem.Enabled);
-
             Assert.IsInstanceOf<ToolStripSeparator>(returnedContextMenu.Items[2]);
 
             mocks.VerifyAll();