Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4eba092cb591f9f164f1e22f5b2bba25b148dda5 -r6ce3cfa19ef59b12462bae4a77e9a7ee5a05e28c
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 4eba092cb591f9f164f1e22f5b2bba25b148dda5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 6ce3cfa19ef59b12462bae4a77e9a7ee5a05e28c)
@@ -198,9 +198,8 @@
                                                                     pipingFailureMechanism,
                                                                     assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -238,9 +237,8 @@
                                                                     pipingFailureMechanism,
                                                                     assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -273,9 +271,8 @@
                                                                     pipingFailureMechanism,
                                                                     assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -316,9 +313,8 @@
                                                                     pipingFailureMechanism,
                                                                     assessmentSection);
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -373,9 +369,8 @@
                     menuBuilderMock.Expect(mb => mb.Build()).Return(null);
                 }
 
-                var gui = mocks.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
-
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -508,9 +503,9 @@
 
                 var mainWindow = mocks.DynamicMock<IMainWindow>();
 
-                var gui = mocks.DynamicMock<IGui>();
-                gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                gui.Expect(g => g.MainWindow).Return(mainWindow);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mainWindow);
 
                 var observer = mocks.StrictMock<IObserver>();
                 observer.Expect(o => o.UpdateObserver());
@@ -568,8 +563,8 @@
                                                                                     pipingFailureMechanism,
                                                                                     assessmentSection);
 
-                var gui = mocks.DynamicMock<IGui>();
-                gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
                 var observer = mocks.StrictMock<IObserver>();
                 observer.Expect(o => o.UpdateObserver()).Repeat.Never();
@@ -617,9 +612,9 @@
 
                 var mainWindow = mocks.DynamicMock<IMainWindow>();
 
-                var gui = mocks.DynamicMock<IGui>();
-                gui.Expect(g => g.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                gui.Expect(g => g.MainWindow).Return(mainWindow);
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(g => g.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.MainWindow).Return(mainWindow);
 
                 var observer = mocks.StrictMock<IObserver>();
                 observer.Expect(o => o.UpdateObserver());
@@ -678,8 +673,8 @@
                                                                                     pipingFailureMechanism,
                                                                                     assessmentSection);
 
-                var gui = mocks.DynamicMock<IGui>();
-                gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(cmp => cmp.Get(pipingCalculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
                 var observer = mocks.StrictMock<IObserver>();
                 if (confirm)