Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9ba806ad0f1b2004435a67eb6e628ec89618f264 -r3c8b0bc8bb3bad70dc25f55e5261f606ecc3c280
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs	(.../DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs)	(revision 9ba806ad0f1b2004435a67eb6e628ec89618f264)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs	(.../DuneErosionHydraulicLoadsContextTreeNodeInfoTest.cs)	(revision 3c8b0bc8bb3bad70dc25f55e5261f606ecc3c280)
@@ -161,6 +161,7 @@
             {
                 var gui = mocksRepository.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                gui.Stub(g => g.ViewHost).Return(mocksRepository.Stub<IViewHost>());
                 mocksRepository.ReplayAll();
 
                 plugin.Gui = gui;
@@ -191,9 +192,8 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocksRepository.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.ViewHost).Return(mocksRepository.Stub<IViewHost>());
                 mocksRepository.ReplayAll();
 
                 plugin.Gui = gui;
@@ -232,9 +232,8 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocksRepository.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.ViewHost).Return(mocksRepository.Stub<IViewHost>());
                 mocksRepository.ReplayAll();
 
                 plugin.Gui = gui;
@@ -295,10 +294,9 @@
                 var gui = mocksRepository.Stub<IGui>();
                 IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocksRepository);
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
-                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.DocumentViewController).Return(mocksRepository.Stub<IDocumentViewController>());
+                gui.Stub(g => g.ViewHost).Return(mocksRepository.Stub<IViewHost>());
 
                 var calculatorFactory = mocksRepository.Stub<IHydraRingCalculatorFactory>();
                 var dunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r23b50eecc9b263dbe0edae0f6955895863c48d7c -r3c8b0bc8bb3bad70dc25f55e5261f606ecc3c280
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 23b50eecc9b263dbe0edae0f6955895863c48d7c)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 3c8b0bc8bb3bad70dc25f55e5261f606ecc3c280)
@@ -204,6 +204,7 @@
             {
                 var gui = mockRepository.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
+                gui.Stub(g => g.ViewHost).Return(mockRepository.Stub<IViewHost>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new DuneErosionPlugin())
@@ -425,9 +426,8 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocks.Stub<IGui>();
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(groupContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 mocks.ReplayAll();
 
                 using (var plugin = new DuneErosionPlugin())
@@ -475,9 +475,8 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mocks.Stub<IGui>();
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(groupContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 mocks.ReplayAll();
 
                 using (var plugin = new DuneErosionPlugin())
@@ -548,10 +547,9 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(groupContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 gui.Stub(g => g.DocumentViewController).Return(mocks.Stub<IDocumentViewController>());
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
 
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
                 var dunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator