Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf3b9d5377e02249b6cd172539692b4b61c41058b -r760717f395cb268d0623db80579d343526428e1c
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision f3b9d5377e02249b6cd172539692b4b61c41058b)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision 760717f395cb268d0623db80579d343526428e1c)
@@ -27,7 +27,6 @@
 using Core.Gui;
 using Core.Gui.Commands;
 using Core.Gui.ContextMenu;
-using Core.Gui.Forms.Main;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -222,7 +221,6 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
-                gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub<IMainWindow>());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -264,7 +262,6 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
-                gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub<IMainWindow>());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -296,7 +293,6 @@
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(g => g.ViewCommands).Return(viewCommands);
                 gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder);
-                gui.Stub(g => g.MainWindow).Return(mocks.Stub<IMainWindow>());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -367,9 +363,6 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder);
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-                gui.Stub(g => g.MainWindow).Return(mocks.Stub<IMainWindow>());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
@@ -407,9 +400,6 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder);
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-                gui.Stub(g => g.MainWindow).Return(mocks.Stub<IMainWindow>());
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rff5ade941877ef564eaf9661a4d9d9ae54ca948a -r760717f395cb268d0623db80579d343526428e1c
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailurePathContextTreeNodeInfoTest.cs	(.../DuneErosionFailurePathContextTreeNodeInfoTest.cs)	(revision ff5ade941877ef564eaf9661a4d9d9ae54ca948a)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailurePathContextTreeNodeInfoTest.cs	(.../DuneErosionFailurePathContextTreeNodeInfoTest.cs)	(revision 760717f395cb268d0623db80579d343526428e1c)
@@ -27,7 +27,6 @@
 using Core.Gui;
 using Core.Gui.Commands;
 using Core.Gui.ContextMenu;
-using Core.Gui.Forms.Main;
 using Core.Gui.Forms.ViewHost;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Framework;
@@ -232,7 +231,6 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
-                gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub<IMainWindow>());
                 gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 mocks.ReplayAll();
 
@@ -280,7 +278,6 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
-                gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub<IMainWindow>());
                 gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 mocks.ReplayAll();
 
@@ -318,7 +315,6 @@
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(g => g.ViewCommands).Return(viewCommands);
                 gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder);
-                gui.Stub(g => g.MainWindow).Return(mocks.Stub<IMainWindow>());
                 gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 mocks.ReplayAll();
 
@@ -401,9 +397,6 @@
             {
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder);
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-                gui.Stub(g => g.MainWindow).Return(mocks.Stub<IMainWindow>());
                 gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 mocks.ReplayAll();