Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbc1b91fbc16e4545efb5000f8360201aa890326a -re2fad5b2b37e27385650e123af4d1d7f374b8aba
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision bc1b91fbc16e4545efb5000f8360201aa890326a)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision e2fad5b2b37e27385650e123af4d1d7f374b8aba)
@@ -199,8 +199,6 @@
             // Assert
             Assert.AreEqual(1, calculations.Count);
             CollectionAssert.DoesNotContain(calculations, calculationForFirstTargetProbability);
-
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -231,6 +229,7 @@
 
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
 
                 mocks.ReplayAll();
 
@@ -257,14 +256,13 @@
                 new DuneErosionFailureMechanism(),
                 assessmentSection);
 
-            var mockRepository = new MockRepository();
-
             using (var treeViewControl = new TreeViewControl())
             {
-                IGui gui = StubFactory.CreateGuiStub(mockRepository);
+                IGui gui = StubFactory.CreateGuiStub(mocks);
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
-                gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub<IMainWindow>());
-                mockRepository.ReplayAll();
+                gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub<IMainWindow>());
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
+                mocks.ReplayAll();
 
                 plugin.Gui = gui;
 
@@ -283,7 +281,7 @@
             }
 
             // Assert
-            mockRepository.VerifyAll();
+            // Done in tearDown
         }
 
         [Test]
@@ -301,6 +299,7 @@
                 var builder = new CustomItemsOnlyContextMenuBuilder();
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
 
                 mocks.ReplayAll();
 
@@ -421,6 +420,7 @@
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
                 var calculationObserver = mocks.StrictMock<IObserver>();
                 calculationObserver.Expect(o => o.UpdateObserver()).Repeat.Times(2);
                 var calculationsObserver = mocks.StrictMock<IObserver>();
@@ -519,6 +519,7 @@
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
 
                 var dunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator();
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
@@ -608,6 +609,7 @@
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
 
                 var dunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator();
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();
@@ -696,6 +698,7 @@
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 gui.Stub(g => g.MainWindow).Return(mainWindow);
+                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
 
                 var dunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator();
                 var calculatorFactory = mocks.Stub<IHydraRingCalculatorFactory>();