Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9087c4fdc971c7bad6f72298863ab7821eaf31b9 -r47edfe96be0d0d471016b7a806046d2a1ee79015
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 9087c4fdc971c7bad6f72298863ab7821eaf31b9)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 47edfe96be0d0d471016b7a806046d2a1ee79015)
@@ -31,10 +31,8 @@
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 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;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
@@ -190,7 +188,6 @@
                 gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
                 gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
-                gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RiskeerPlugin())
@@ -465,8 +462,6 @@
                 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(mockRepository.Stub<IDocumentViewController>());
-                gui.Stub(g => g.ViewCommands).Return(mockRepository.Stub<IViewCommands>());
                 gui.Stub(g => g.ProjectStore).Return(mockRepository.Stub<IStoreProject>());
 
                 var designWaterLevelCalculator = new TestDesignWaterLevelCalculator
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc799f3def0c4e94bda8d5ffcbfa32cadea04ffbd -r47edfe96be0d0d471016b7a806046d2a1ee79015
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision c799f3def0c4e94bda8d5ffcbfa32cadea04ffbd)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 47edfe96be0d0d471016b7a806046d2a1ee79015)
@@ -31,10 +31,8 @@
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 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;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
@@ -191,7 +189,6 @@
                 gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
                 gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
-                gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RiskeerPlugin())
@@ -534,8 +531,6 @@
                 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(mockRepository.Stub<IDocumentViewController>());
-                gui.Stub(g => g.ViewCommands).Return(mockRepository.Stub<IViewCommands>());
                 gui.Stub(g => g.ProjectStore).Return(mockRepository.Stub<IStoreProject>());
 
                 var designWaterLevelCalculator = new TestDesignWaterLevelCalculator
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1f219ba0936738435cfa9803a7acd2001294dde7 -r47edfe96be0d0d471016b7a806046d2a1ee79015
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 1f219ba0936738435cfa9803a7acd2001294dde7)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 47edfe96be0d0d471016b7a806046d2a1ee79015)
@@ -31,10 +31,8 @@
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 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;
 using Core.Gui.TestUtil.ContextMenu;
 using NUnit.Extensions.Forms;
@@ -191,7 +189,6 @@
                 gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
                 gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
-                gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
                 mockRepository.ReplayAll();
 
                 using (var plugin = new RiskeerPlugin())
@@ -534,8 +531,6 @@
                 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(mockRepository.Stub<IDocumentViewController>());
-                gui.Stub(g => g.ViewCommands).Return(mockRepository.Stub<IViewCommands>());
                 gui.Stub(g => g.ProjectStore).Return(mockRepository.Stub<IStoreProject>());
 
                 var waveHeightCalculator = new TestWaveHeightCalculator