Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs
===================================================================
diff -u -r95e50a1e42a604cb499d74be1b0a940d23314812 -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs	(.../DuneLocationsViewTest.cs)	(revision 95e50a1e42a604cb499d74be1b0a940d23314812)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationsViewTest.cs	(.../DuneLocationsViewTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -200,13 +200,13 @@
         }
 
         [Test]
-        public void DuneLocationsView_AssessmentSection_CorrectlyAttachedAndDetached()
+        public void GivenDuneLocationsView_WhenSettingAssessmentSectionAndDisposingView_ThenCorrectlyAttachAndDetachAssessmentSection()
         {
             // Setup
             DuneLocationsView view = ShowFullyConfiguredDuneLocationsView();
             var assessmentSection = mocks.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.Attach(null)).IgnoreArguments();
-            assessmentSection.Expect(a => a.Detach(null)).IgnoreArguments();
+            assessmentSection.Expect(a => a.Attach(Arg<IObserver>.Is.NotNull)).IgnoreArguments();
+            assessmentSection.Expect(a => a.Detach(Arg<IObserver>.Is.NotNull)).IgnoreArguments();
             mocks.ReplayAll();
 
             // Call
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0e6d67805775b5b8a587156ba1d647ad35bb7441 -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationsContextTreeNodeInfoTest.cs	(.../DuneLocationsContextTreeNodeInfoTest.cs)	(revision 0e6d67805775b5b8a587156ba1d647ad35bb7441)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationsContextTreeNodeInfoTest.cs	(.../DuneLocationsContextTreeNodeInfoTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -169,9 +169,9 @@
             // Setup
             using (var treeViewControl = new TreeViewControl())
             {
-                var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var failureMechanism = new DuneErosionFailureMechanism();
-                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSectionMock);
+                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
 
                 var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
 
@@ -187,8 +187,8 @@
                     menuBuilder.Expect(mb => mb.Build()).Return(null);
                 }
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                 mocks.ReplayAll();
 
@@ -210,18 +210,20 @@
             {
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
-                var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-                assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
                 var failureMechanism = new DuneErosionFailureMechanism
                 {
                     Contribution = 10
                 };
-                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSectionMock);
 
                 var builder = new CustomItemsOnlyContextMenuBuilder();
+                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -256,18 +258,20 @@
                     Version = "1.0"
                 };
 
-                var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-                assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
                 var failureMechanism = new DuneErosionFailureMechanism
                 {
                     Contribution = 10
                 };
-                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSectionMock);
 
                 var builder = new CustomItemsOnlyContextMenuBuilder();
+                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -299,15 +303,17 @@
                     Version = "1.0"
                 };
 
-                var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-                assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
                 var failureMechanism = new DuneErosionFailureMechanism();
-                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSectionMock);
 
                 var builder = new CustomItemsOnlyContextMenuBuilder();
+                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -341,18 +347,20 @@
                     Version = "1.0"
                 };
 
-                var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-                assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+
                 var failureMechanism = new DuneErosionFailureMechanism
                 {
                     Contribution = 10
                 };
-                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSectionMock);
 
                 var builder = new CustomItemsOnlyContextMenuBuilder();
+                var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -423,9 +431,9 @@
                 var builder = new CustomItemsOnlyContextMenuBuilder();
 
                 var mainWindowStub = mocks.Stub<IMainWindow>();
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(builder);
-                gui.Expect(g => g.MainWindow).Return(mainWindowStub);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+                gui.Stub(g => g.MainWindow).Return(mainWindowStub);
                 var observerMock = mocks.StrictMock<IObserver>();
                 observerMock.Expect(o => o.UpdateObserver());
                 mocks.ReplayAll();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rd82035163d2c3826a24e898b45e13147edd475a9 -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision d82035163d2c3826a24e898b45e13147edd475a9)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -150,13 +150,13 @@
         }
 
         [Test]
-        public void DesignWaterLevelLocationsView_AssessmentSection_CorrectlyAttachedAndDetached()
+        public void GivenDesignWaterLevelLocationsView_WhenSettingAssessmentSectionAndDisposingView_ThenCorrectlyAttachAndDetachAssessmentSection()
         {
             // Setup
             GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
             var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.Attach(null)).IgnoreArguments();
-            assessmentSection.Expect(a => a.Detach(null)).IgnoreArguments();
+            assessmentSection.Expect(a => a.Attach(Arg<IObserver>.Is.NotNull)).IgnoreArguments();
+            assessmentSection.Expect(a => a.Detach(Arg<IObserver>.Is.NotNull)).IgnoreArguments();
             mockRepository.ReplayAll();
 
             // Call
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -rd82035163d2c3826a24e898b45e13147edd475a9 -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision d82035163d2c3826a24e898b45e13147edd475a9)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -146,13 +146,13 @@
         }
 
         [Test]
-        public void WaveHeightLocationsView_AssessmentSection_CorrectlyAttachedAndDetached()
+        public void GivenWaveHeightLocationsView_WhenSettingAssessmentSectionAndDisposingView_ThenCorrectlyAttachAndDetachAssessmentSection()
         {
             // Setup
             GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
             var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.Attach(null)).IgnoreArguments();
-            assessmentSection.Expect(a => a.Detach(null)).IgnoreArguments();
+            assessmentSection.Expect(a => a.Attach(Arg<IObserver>.Is.NotNull)).IgnoreArguments();
+            assessmentSection.Expect(a => a.Detach(Arg<IObserver>.Is.NotNull)).IgnoreArguments();
             mockRepository.ReplayAll();
 
             // Call
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0e6d67805775b5b8a587156ba1d647ad35bb7441 -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 0e6d67805775b5b8a587156ba1d647ad35bb7441)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -95,12 +95,12 @@
         public void Text_Always_ReturnName()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                 new ObservableList<HydraulicBoundaryLocation>(),
-                assessmentSectionMock,
+                assessmentSection,
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
@@ -120,11 +120,11 @@
         public void Image_Always_ReturnGenericInputOutputIcon()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
             var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                 new ObservableList<HydraulicBoundaryLocation>(),
-                assessmentSectionMock,
+                assessmentSection,
                 new GrassCoverErosionOutwardsFailureMechanism());
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
@@ -143,7 +143,7 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
@@ -152,20 +152,24 @@
 
                 var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                     new ObservableList<HydraulicBoundaryLocation>(),
-                    assessmentSectionMock,
+                    assessmentSection,
                     new GrassCoverErosionOutwardsFailureMechanism());
 
                 var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
-                menuBuilder.Expect(mb => mb.AddOpenItem()).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.AddPropertiesItem()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.Build()).Return(null);
 
-                var gui = mockRepository.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                using (mockRepository.Ordered())
+                {
+                    menuBuilder.Expect(mb => mb.AddOpenItem()).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.AddPropertiesItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.Build()).Return(null);
+                }
 
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+
                 mockRepository.ReplayAll();
 
                 plugin.Gui = gui;
@@ -182,8 +186,8 @@
         public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
             var applicationFeatureCommandHandler = mockRepository.Stub<IApplicationFeatureCommands>();
             var importCommandHandler = mockRepository.Stub<IImportCommandHandler>();
@@ -199,7 +203,7 @@
 
                     var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism
                         {
                             Contribution = 5
@@ -212,8 +216,8 @@
                                                              context,
                                                              treeViewControl);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -239,8 +243,8 @@
         public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"), "complete.sqlite"),
                 Version = "1.0"
@@ -260,7 +264,7 @@
 
                     var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism());
 
                     var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
@@ -270,8 +274,8 @@
                                                              context,
                                                              treeViewControl);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -297,8 +301,8 @@
         public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"), "complete.sqlite"),
                 Version = "1.0"
@@ -318,7 +322,7 @@
 
                     var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism
                         {
                             Contribution = 5
@@ -331,8 +335,8 @@
                                                              context,
                                                              treeViewControl);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -359,7 +363,6 @@
             // Setup
             string filePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
 
-            var guiMock = mockRepository.DynamicMock<IGui>();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
                 Contribution = 5
@@ -378,14 +381,15 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new GrassCoverErosionOutwardsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
                     plugin.Activate();
 
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
@@ -419,7 +423,6 @@
         public void GivenHydraulicBoundaryLocationSucceeds_CalculatingDesignWaterLevelFromContextMenu_ThenLogMessagesAddedOutputSet()
         {
             // Given
-            var guiMock = mockRepository.DynamicMock<IGui>();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
                 Contribution = 5
@@ -435,14 +438,15 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new GrassCoverErosionOutwardsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
                     plugin.Activate();
 
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0e6d67805775b5b8a587156ba1d647ad35bb7441 -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 0e6d67805775b5b8a587156ba1d647ad35bb7441)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -51,6 +51,7 @@
     {
         private const int contextMenuRunWaveHeightCalculationsIndex = 2;
         private MockRepository mockRepository;
+
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
         [SetUp]
@@ -93,11 +94,11 @@
         public void Text_Always_ReturnName()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
             var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                 new ObservableList<HydraulicBoundaryLocation>(),
-                assessmentSectionMock,
+                assessmentSection,
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
@@ -116,11 +117,11 @@
         public void Image_Always_ReturnGenericInputOutputIcon()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
             var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                 new ObservableList<HydraulicBoundaryLocation>(),
-                assessmentSectionMock,
+                assessmentSection,
                 new GrassCoverErosionOutwardsFailureMechanism());
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
@@ -139,7 +140,7 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -148,7 +149,7 @@
                     TreeNodeInfo info = GetInfo(plugin);
                     var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism());
 
                     var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
@@ -163,8 +164,8 @@
                         menuBuilder.Expect(mb => mb.Build()).Return(null);
                     }
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -183,8 +184,8 @@
         public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
             var applicationFeatureCommandHandler = mockRepository.Stub<IApplicationFeatureCommands>();
             var importCommandHandler = mockRepository.Stub<IImportCommandHandler>();
@@ -200,7 +201,7 @@
 
                     var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism
                         {
                             Contribution = 5
@@ -213,8 +214,8 @@
                                                              context,
                                                              treeViewControl);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -240,8 +241,8 @@
         public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"), "complete.sqlite"),
                 Version = "1.0"
@@ -261,7 +262,7 @@
 
                     var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism());
 
                     var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
@@ -271,8 +272,8 @@
                                                              context,
                                                              treeViewControl);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -298,8 +299,8 @@
         public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"), "complete.sqlite"),
                 Version = "1.0"
@@ -319,7 +320,7 @@
 
                     var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
                         new ObservableList<HydraulicBoundaryLocation>(),
-                        assessmentSectionMock,
+                        assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism
                         {
                             Contribution = 5
@@ -332,8 +333,8 @@
                                                              context,
                                                              treeViewControl);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
                     mockRepository.ReplayAll();
 
@@ -359,7 +360,6 @@
         public void GivenHydraulicBoundaryLocationThatFails_CalculatingWaveHeightFromContextMenu_ThenLogMessagesAddedPreviousOutputNotAffected()
         {
             // Given
-            var guiMock = mockRepository.DynamicMock<IGui>();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
                 Contribution = 5
@@ -378,11 +378,12 @@
                 using (var plugin = new GrassCoverErosionOutwardsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
-                    guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                    guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                    var gui = mockRepository.Stub<IGui>();
+                    gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                    gui.Stub(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                     mockRepository.ReplayAll();
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
                     plugin.Activate();
 
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
@@ -406,7 +407,6 @@
         public void CalculateWaveHeightsFromContextMenu_Always_SendsRightInputToCalculationService()
         {
             // Setup
-            var guiMock = mockRepository.DynamicMock<IGui>();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
                 Contribution = 5
@@ -426,14 +426,15 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new GrassCoverErosionOutwardsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
                     plugin.Activate();
 
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r604d0e202fa546642f20240c80aac5d98447e4fc -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 604d0e202fa546642f20240c80aac5d98447e4fc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -49,6 +49,7 @@
     {
         private const int contextMenuRunAssessmentLevelCalculationsIndex = 2;
         private MockRepository mockRepository;
+
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
         [SetUp]
@@ -123,32 +124,34 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
-            var guiMock = mockRepository.StrictMock<IGui>();
             var menuBuilderMock = mockRepository.StrictMock<IContextMenuBuilder>();
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
 
-            var nodeData = new DesignWaterLevelLocationsContext(assessmentSectionMock);
+            var nodeData = new DesignWaterLevelLocationsContext(assessmentSection);
 
-            menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-            guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+            using (mockRepository.Ordered())
+            {
+                menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().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())
             {
-                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
-
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
 
                     // Call
                     info.ContextMenuStrip(nodeData, null, treeViewControl);
@@ -162,9 +165,9 @@
         public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
 
-            var nodeData = new DesignWaterLevelLocationsContext(assessmentSectionMock)
+            var nodeData = new DesignWaterLevelLocationsContext(assessmentSection)
             {
                 WrappedData =
                 {
@@ -174,17 +177,17 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var guiMock = mockRepository.StrictMock<IGui>();
-                guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
 
                     // Call
                     using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
@@ -207,9 +210,9 @@
         public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
 
-            var nodeData = new DesignWaterLevelLocationsContext(assessmentSectionMock)
+            var nodeData = new DesignWaterLevelLocationsContext(assessmentSection)
             {
                 WrappedData =
                 {
@@ -222,17 +225,17 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var guiMock = mockRepository.StrictMock<IGui>();
-                guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
 
                     // Call
                     using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
@@ -255,8 +258,6 @@
         public void GivenHydraulicBoundaryLocationThatSucceeds_CalculatingAssessmentLevelFromContextMenu_ThenLogMessagesAddedOutputSet()
         {
             // Given
-            var guiMock = mockRepository.DynamicMock<IGui>();
-
             var location = new HydraulicBoundaryLocation(1, "locationName", 1.1, 2.2);
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
@@ -274,9 +275,12 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
-                guiMock.Expect(g => g.DocumentViewController).Return(mockRepository.Stub<IDocumentViewController>());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                gui.Stub(g => g.DocumentViewController).Return(mockRepository.Stub<IDocumentViewController>());
                 mockRepository.ReplayAll();
 
                 DialogBoxHandler = (name, wnd) =>
@@ -287,7 +291,7 @@
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
                     plugin.Activate();
 
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r604d0e202fa546642f20240c80aac5d98447e4fc -r624268bcc5f60b5965bb056ca72cea15daff06f3
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 604d0e202fa546642f20240c80aac5d98447e4fc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 624268bcc5f60b5965bb056ca72cea15daff06f3)
@@ -125,32 +125,34 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
-            var guiMock = mockRepository.StrictMock<IGui>();
             var menuBuilderMock = mockRepository.StrictMock<IContextMenuBuilder>();
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
 
-            var nodeData = new WaveHeightLocationsContext(assessmentSectionMock);
+            var nodeData = new WaveHeightLocationsContext(assessmentSection);
 
-            menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-            guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+            using (mockRepository.Ordered())
+            {
+                menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().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())
             {
-                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
-
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
 
                     // Call
                     info.ContextMenuStrip(nodeData, null, treeViewControl);
@@ -164,29 +166,28 @@
         public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
-            var guiMock = mockRepository.StrictMock<IGui>();
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-
-            var nodeData = new WaveHeightLocationsContext(assessmentSectionMock)
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            var nodeData = new WaveHeightLocationsContext(assessmentSection)
             {
                 WrappedData =
                 {
                     HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
                 }
             };
-            guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
 
                     // Call
                     using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
@@ -209,10 +210,8 @@
         public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled()
         {
             // Setup
-            var guiMock = mockRepository.StrictMock<IGui>();
-            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
-
-            var nodeData = new WaveHeightLocationsContext(assessmentSectionMock)
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            var nodeData = new WaveHeightLocationsContext(assessmentSection)
             {
                 WrappedData =
                 {
@@ -222,19 +221,20 @@
                     }
                 }
             };
-            guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-            guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
 
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
 
                     // Call
                     using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl))
@@ -257,8 +257,6 @@
         public void GivenHydraulicBoundaryLocationThatSucceeds_CalculatingWaveHeightFromContextMenu_ThenLogMessagesAddedPreviousOutputAffected()
         {
             // Given
-            var guiMock = mockRepository.DynamicMock<IGui>();
-
             const string locationName = "locationName";
             var location = new HydraulicBoundaryLocation(1, locationName, 1.1, 2.2);
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
@@ -278,9 +276,12 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
-                guiMock.Expect(g => g.DocumentViewController).Return(mockRepository.Stub<IDocumentViewController>());
+                var gui = mockRepository.Stub<IGui>();
+                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
+                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
+                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                gui.Stub(g => g.DocumentViewController).Return(mockRepository.Stub<IDocumentViewController>());
                 mockRepository.ReplayAll();
 
                 DialogBoxHandler = (name, wnd) =>
@@ -291,7 +292,7 @@
                 using (var plugin = new RingtoetsPlugin())
                 {
                     TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = guiMock;
+                    plugin.Gui = gui;
                     plugin.Activate();
 
                     using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))