Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -re4dc5a2f979cd2d810010b683969c20d30bce846
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
@@ -192,8 +192,8 @@
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
                                                                                  .AddExportItem()
                                                                                  .AddSeparator()
-                                                                                 .AddExpandAllItem()
                                                                                  .AddCollapseAllItem()
+                                                                                 .AddExpandAllItem()
                                                                                  .Build(),
                 ForeColor = context => context.AssessmentSection.HydraulicBoundaryDatabase == null ?
                                            Color.FromKnownColor(KnownColor.GrayText) :
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -re4dc5a2f979cd2d810010b683969c20d30bce846
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs	(.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs	(.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
@@ -123,12 +123,16 @@
                 var context = new HydraulicBoundariesGroupContext(failureMechanism.HydraulicBoundaryLocations, failureMechanism, assessmentSectionMock);
 
                 var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
-                menuBuilder.Expect(mb => mb.AddExportItem()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.Build()).Return(null);
 
+                using (mockRepository.Ordered())
+                {
+                    menuBuilder.Expect(mb => mb.AddExportItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.Build()).Return(null);
+                }
+
                 var gui = mockRepository.StrictMock<IGui>();
                 gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -ra3c988fd496fe9d11e875c483f25dc599a0fe4c0 -re4dc5a2f979cd2d810010b683969c20d30bce846
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision a3c988fd496fe9d11e875c483f25dc599a0fe4c0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
@@ -231,12 +231,12 @@
                                                               Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText),
                 ChildNodeObjects = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Cast<object>().ToArray(),
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
-                                                                                 .AddDeleteChildrenItem()
-                                                                                 .AddSeparator()
                                                                                  .AddImportItem()
                                                                                  .AddSeparator()
-                                                                                 .AddExpandAllItem()
+                                                                                 .AddDeleteChildrenItem()
+                                                                                 .AddSeparator()
                                                                                  .AddCollapseAllItem()
+                                                                                 .AddExpandAllItem()
                                                                                  .Build()
             };
 
@@ -248,8 +248,8 @@
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
                                                                                  .AddDeleteItem()
                                                                                  .AddSeparator()
-                                                                                 .AddExpandAllItem()
                                                                                  .AddCollapseAllItem()
+                                                                                 .AddExpandAllItem()
                                                                                  .AddSeparator()
                                                                                  .AddPropertiesItem()
                                                                                  .Build(),
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -re4dc5a2f979cd2d810010b683969c20d30bce846
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs	(.../StochasticSoilModelTreeNodeInfoTest.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
@@ -277,14 +277,18 @@
 
             var mocks = new MockRepository();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
+            using (mocks.Ordered())
+            {
+                menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+            }
+
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocks.Stub<IGui>();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2d006ceaaef282af15090fe5505ffeca58a291e0 -re4dc5a2f979cd2d810010b683969c20d30bce846
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelsContextTreeNodeInfoTest.cs	(.../StochasticSoilModelsContextTreeNodeInfoTest.cs)	(revision 2d006ceaaef282af15090fe5505ffeca58a291e0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelsContextTreeNodeInfoTest.cs	(.../StochasticSoilModelsContextTreeNodeInfoTest.cs)	(revision e4dc5a2f979cd2d810010b683969c20d30bce846)
@@ -194,13 +194,16 @@
             // Setup
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            menuBuilderMock.Expect(mb => mb.AddDeleteChildrenItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+            using (mocks.Ordered())
+            {
+                menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddDeleteChildrenItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+            }
 
             using (var treeViewControl = new TreeViewControl())
             {