Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r97ca4ceabc8b32833dc748c7e9e10898e64cfb3c -r3d1b482e4e8307e869128eca15b9bab300bea099
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 97ca4ceabc8b32833dc748c7e9e10898e64cfb3c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 3d1b482e4e8307e869128eca15b9bab300bea099)
@@ -83,7 +83,8 @@
     [TestFixture]
     public class AssessmentSectionTreeNodeInfoTest
     {
-        private const int contextMenuCalculateAllIndex = 4;
+        private const int contextMenuImportAssessmentSectionIndex = 2;
+        private const int contextMenuCalculateAllIndex = 6;
         private MockRepository mocks;
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Forms, "HydraulicBoundaryDatabase");
 
@@ -336,10 +337,10 @@
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddRenameItem()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
+                menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
+                menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddDeleteItem()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder);
@@ -372,43 +373,9 @@
         }
 
         [Test]
-        public void ContextMenuStrip_Always_ContextMenuItemImportAssessmentSectionEnabled()
+        public void ContextMenuStrip_Always_AddCustomItems()
         {
             // Setup
-            var section = new AssessmentSection(AssessmentSectionComposition.Dike);
-            using (var treeViewControl = new TreeViewControl())
-            {
-                var gui = mocks.Stub<IGui>();
-                gui.Stub(g => g.Get(section, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-                mocks.ReplayAll();
-
-                using (var plugin = new RingtoetsPlugin())
-                {
-                    TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = gui;
-
-                    // Call
-                    using (ContextMenuStrip contextMenu = info.ContextMenuStrip(section, section, treeViewControl))
-                    {
-                        const string expectedItemText = "&Importeren...";
-                        const string expectedItemTooltip = "Importeer de gegevens vanuit een bestand.";
-                        TestHelper.AssertContextMenuStripContainsItem(contextMenu, 2,
-                                                                      expectedItemText, expectedItemTooltip,
-                                                                      CoreCommonGuiResources.ImportIcon);
-                    }
-                }
-            }
-
-            // Assert
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_AddCustomItems()
-        {
-            // Setup
             using (var treeView = new TreeViewControl())
             {
                 var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
@@ -430,6 +397,11 @@
                         // Assert
                         Assert.AreEqual(14, menu.Items.Count);
 
+                        TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuImportAssessmentSectionIndex,
+                                                                      "&Importeren...",
+                                                                      "Importeer de gegevens vanuit een bestand.",
+                                                                      CoreCommonGuiResources.ImportIcon);
+
                         TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                                       "Alles be&rekenen",
                                                                       "Voer alle berekeningen binnen dit traject uit.",