Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext.cs
===================================================================
diff -u -re5a11251693f46473c8d26294c75067f01ce088c -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext.cs)	(revision e5a11251693f46473c8d26294c75067f01ce088c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -37,7 +37,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext"/>.
         /// </summary>
-        /// <param name="wrappedData">The calculations for the context belongs to.</param>
+        /// <param name="wrappedData">The calculations the context belongs to.</param>
         /// <param name="failureMechanism">The failure mechanism the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section the context belongs to.</param>
         /// <param name="getNormFunc"><see cref="Func{TResult}"/> for obtaining the norm to use during calculations.</param>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContext.cs
===================================================================
diff -u -rd7ade6bfc94f45614a0d633a3932478a2cc980c3 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContext.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContext.cs)	(revision d7ade6bfc94f45614a0d633a3932478a2cc980c3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContext.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContext.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -37,7 +37,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveHeightCalculationsContext"/>.
         /// </summary>
-        /// <param name="wrappedData">The calculations for the context belongs to.</param>
+        /// <param name="wrappedData">The calculations the context belongs to.</param>
         /// <param name="failureMechanism">The failure mechanism the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section the context belongs to.</param>
         /// <param name="getNormFunc"><see cref="Func{TResult}"/> for obtaining the norm to use during calculations.</param>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/HydraulicBoundariesGroupContext.cs
===================================================================
diff -u -rc9a8934df2671ef962b4049125df9acb92a2d23f -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/HydraulicBoundariesGroupContext.cs	(.../HydraulicBoundariesGroupContext.cs)	(revision c9a8934df2671ef962b4049125df9acb92a2d23f)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/HydraulicBoundariesGroupContext.cs	(.../HydraulicBoundariesGroupContext.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -37,7 +37,7 @@
         /// </summary>
         /// <param name="wrappedData">The hydraulic boundaries database to wrap.</param>
         /// <param name="failureMechanism">The grass cover erosion outwards failure mechanism the calculations belong to.</param>
-        /// <param name="assessmentSection">The assessment section the calculations belong to.</param>
+        /// <param name="assessmentSection">The assessment section the hydraulic boundary database belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public HydraulicBoundariesGroupContext(HydraulicBoundaryDatabase wrappedData,
                                                GrassCoverErosionOutwardsFailureMechanism failureMechanism,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTest.cs
===================================================================
diff -u -re5a11251693f46473c8d26294c75067f01ce088c -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTest.cs)	(revision e5a11251693f46473c8d26294c75067f01ce088c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -39,11 +39,10 @@
         {
             // Setup
             var mocks = new MockRepository();
+            var calculations = mocks.Stub<IObservableEnumerable<HydraulicBoundaryLocationCalculation>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
-
             // Call
             TestDelegate call = () => new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(calculations, null, assessmentSection,
                                                                                                        () => 0.1, "Test name");
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs
===================================================================
diff -u -r8b0dd5111c3972c3a64705f82b7b11330b9136c5 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs)	(revision 8b0dd5111c3972c3a64705f82b7b11330b9136c5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -39,11 +39,10 @@
         {
             // Setup
             var mocks = new MockRepository();
+            var calculations = mocks.Stub<IObservableEnumerable<HydraulicBoundaryLocationCalculation>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
-
             // Call
             TestDelegate call = () => new GrassCoverErosionOutwardsWaveHeightCalculationsContext(calculations, null, assessmentSection,
                                                                                                  () => 0.1, "Test name");
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/HydraulicBoundariesGroupContextTest.cs
===================================================================
diff -u -r4c361bc2c62b8573dc2b26b9d51d378b519a52a8 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/HydraulicBoundariesGroupContextTest.cs	(.../HydraulicBoundariesGroupContextTest.cs)	(revision 4c361bc2c62b8573dc2b26b9d51d378b519a52a8)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/HydraulicBoundariesGroupContextTest.cs	(.../HydraulicBoundariesGroupContextTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -40,17 +40,17 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
             mockRepository.ReplayAll();
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
-            var context = new HydraulicBoundariesGroupContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection);
+            var context = new HydraulicBoundariesGroupContext(hydraulicBoundaryDatabase, failureMechanism, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<ObservableWrappedObjectContextBase<HydraulicBoundaryDatabase>>(context);
-            Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.WrappedData);
+            Assert.AreSame(hydraulicBoundaryDatabase, context.WrappedData);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             mockRepository.VerifyAll();
@@ -62,11 +62,12 @@
             // Setup
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
             mockRepository.ReplayAll();
 
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+
             // Call
-            TestDelegate call = () => new HydraulicBoundariesGroupContext(assessmentSection.HydraulicBoundaryDatabase, null, assessmentSection);
+            TestDelegate call = () => new HydraulicBoundariesGroupContext(hydraulicBoundaryDatabase, null, assessmentSection);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -78,20 +79,15 @@
         public void Constructor_AssessmentSectionIsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
-            mockRepository.ReplayAll();
-
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
-            TestDelegate call = () => new HydraulicBoundariesGroupContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, null);
+            TestDelegate call = () => new HydraulicBoundariesGroupContext(hydraulicBoundaryDatabase, failureMechanism, null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
             Assert.AreEqual("assessmentSection", paramName);
-            mockRepository.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -rd5726a40a7587c89a9351c0bbe82e03b33ad0d35 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs)	(revision d5726a40a7587c89a9351c0bbe82e03b33ad0d35)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs	(.../HydraulicBoundariesGroupContextWaveConditionsExportInfoTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -27,7 +27,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -recc8ef0eb9c115e10464b534e6c83c2bb780f9d1 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision ecc8ef0eb9c115e10464b534e6c83c2bb780f9d1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -126,8 +126,6 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mockRepository.Stub<IGui>();
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
                 mockRepository.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8b0dd5111c3972c3a64705f82b7b11330b9136c5 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 8b0dd5111c3972c3a64705f82b7b11330b9136c5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -126,8 +126,6 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var gui = mockRepository.Stub<IGui>();
-                gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
-                gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
                 gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
                 mockRepository.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs
===================================================================
diff -u -r77808fe4c8c80be5647aa5f53551d32149ac3b18 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs)	(revision 77808fe4c8c80be5647aa5f53551d32149ac3b18)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -119,6 +119,7 @@
 
                 // Assert
                 Assert.AreSame(assessmentSection, view.AssessmentSection);
+                Assert.AreSame(grassCoverErosionOutwardsFailureMechanism, view.FailureMechanism);
             }
 
             mockRepository.VerifyAll();
@@ -204,7 +205,6 @@
                     info.AfterCreate(view, data);
 
                     // Assert
-                    Assert.AreSame(grassCoverErosionOutwardsFailureMechanism, view.FailureMechanism);
                     Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationGuiService>(view.CalculationGuiService);
                 }
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs
===================================================================
diff -u -rd30f76d43afcd7c5beb1315af8eb2cdc1de1b9a6 -r67d4254e33530e24d4d331437092392b69553ddd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs)	(revision d30f76d43afcd7c5beb1315af8eb2cdc1de1b9a6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs)	(revision 67d4254e33530e24d4d331437092392b69553ddd)
@@ -115,6 +115,7 @@
 
                 // Assert
                 Assert.AreSame(assessmentSection, view.AssessmentSection);
+                Assert.AreSame(grassCoverErosionOutwardsFailureMechanism, view.FailureMechanism);
             }
 
             mockRepository.VerifyAll();
@@ -192,7 +193,6 @@
                     info.AfterCreate(view, data);
 
                     // Assert
-                    Assert.AreSame(failureMechanism, view.FailureMechanism);
                     Assert.IsInstanceOf<IHydraulicBoundaryLocationCalculationGuiService>(view.CalculationGuiService);
                 }
             }