Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -re564b08de50a99a34d2342e7994090039bc6d058
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision f2f7d22ee59276f5df1f83fd409899bd895ea163)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision e564b08de50a99a34d2342e7994090039bc6d058)
@@ -87,15 +87,15 @@
         public void Text_Always_ReturnsTextFromResource()
         {
             // Setup
-            var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
             var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 heightStructuresCalculation.InputParameters,
                 heightStructuresCalculation,
                 new HeightStructuresFailureMechanism(),
-                assessmentSectionStub);
+                assessmentSection);
 
             // Call
             var text = info.Text(heightStructuresInputContext);
@@ -108,15 +108,15 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
             var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 heightStructuresCalculation.InputParameters,
                 heightStructuresCalculation,
                 new HeightStructuresFailureMechanism(),
-                assessmentSectionStub);
+                assessmentSection);
 
             // Call
             var image = info.Image(heightStructuresInputContext);
@@ -129,18 +129,22 @@
         public void ContextMenuStrip_Always_CallsBuilderMethods()
         {
             // Setup
-            var guiMock = mocksRepository.StrictMock<IGui>();
             var menuBuilderMock = mocksRepository.StrictMock<IContextMenuBuilder>();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                var gui = mocksRepository.Stub<IGui>();
+                gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
 
-                menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+                using (mocksRepository.Ordered())
+                {
+                    menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+                    menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+                }
+
                 mocksRepository.ReplayAll();
 
-                plugin.Gui = guiMock;
+                plugin.Gui = gui;
 
                 // Call
                 info.ContextMenuStrip(null, null, treeViewControl);