Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -rde83fe537e2d96e7bf5676d40d0fe6d24ff0afcd -ra4bb32d891f5f1603dca7d0cf1db831bdec0471d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs)	(revision de83fe537e2d96e7bf5676d40d0fe6d24ff0afcd)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs)	(revision a4bb32d891f5f1603dca7d0cf1db831bdec0471d)
@@ -31,10 +31,8 @@
 using Core.Common.TestUtil;
 using Core.Common.Util;
 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;
@@ -507,8 +505,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();
@@ -594,8 +590,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();
@@ -680,8 +674,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();
@@ -759,8 +751,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 calculator = new TestDesignWaterLevelCalculator
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -rde83fe537e2d96e7bf5676d40d0fe6d24ff0afcd -ra4bb32d891f5f1603dca7d0cf1db831bdec0471d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision de83fe537e2d96e7bf5676d40d0fe6d24ff0afcd)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision a4bb32d891f5f1603dca7d0cf1db831bdec0471d)
@@ -31,10 +31,8 @@
 using Core.Common.TestUtil;
 using Core.Common.Util;
 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;
@@ -586,8 +584,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();
@@ -675,8 +671,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();
@@ -762,8 +756,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();
@@ -842,8 +834,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 calculator = new TestDesignWaterLevelCalculator
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -rac745d73fcd1ce42c8f961da9ae66e988f7606c3 -ra4bb32d891f5f1603dca7d0cf1db831bdec0471d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision ac745d73fcd1ce42c8f961da9ae66e988f7606c3)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision a4bb32d891f5f1603dca7d0cf1db831bdec0471d)
@@ -31,10 +31,8 @@
 using Core.Common.TestUtil;
 using Core.Common.Util;
 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;
@@ -586,8 +584,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();
@@ -675,8 +671,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();
@@ -762,8 +756,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();
@@ -842,8 +834,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 calculator = new TestWaveHeightCalculator