Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs
===================================================================
diff -u -r8587508c66a1bc0938465e97cf365cc1ef254f53 -r82daf7501673e736db81576d6cf2cad2b4450e21
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 82daf7501673e736db81576d6cf2cad2b4450e21)
@@ -31,7 +31,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order to be able to create configurable closing structures calculations.
     /// </summary>
-    public class ClosingStructuresCalculationGroupContext : ClosingStructuresContextBase<CalculationGroup>, ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresCalculationGroupContext : ClosingStructuresContextBase<CalculationGroup>,
+                                                            ICalculationContext<CalculationGroup, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresCalculationGroupContext"/>.
@@ -40,7 +41,9 @@
         /// <param name="failureMechanism">The failure mechanism of the instance.</param>
         /// <param name="assessmentSection">The assessment section of the instance.</param>
         /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c>.</exception>
-        public ClosingStructuresCalculationGroupContext(CalculationGroup calculationGroup, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) :
-            base(calculationGroup, failureMechanism, assessmentSection) {}
+        public ClosingStructuresCalculationGroupContext(CalculationGroup calculationGroup,
+                                                        ClosingStructuresFailureMechanism failureMechanism,
+                                                        IAssessmentSection assessmentSection) :
+                                                            base(calculationGroup, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2a48ccf3a43d03b13a90b073a05afa4e2dd80436 -r82daf7501673e736db81576d6cf2cad2b4450e21
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2a48ccf3a43d03b13a90b073a05afa4e2dd80436)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 82daf7501673e736db81576d6cf2cad2b4450e21)
@@ -73,7 +73,7 @@
         public void SetUp()
         {
             mocks = new MockRepository();
-            guiMock = mocks.StrictMock<IGui>();
+            guiMock = mocks.Stub<IGui>();
             plugin = new HeightStructuresPlugin
             {
                 Gui = guiMock
@@ -115,7 +115,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             var groupContext = new HeightStructuresCalculationGroupContext(group,
@@ -133,8 +133,8 @@
         public void ChildNodeObjects_GroupWithMixedContents_ReturnChildren()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculationItemMock = mocks.StrictMock<ICalculationBase>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            var calculationItemMock = mocks.Stub<ICalculationBase>();
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -171,7 +171,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var groupContext = new HeightStructuresCalculationGroupContext(group,
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
@@ -212,7 +212,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var groupContext = new HeightStructuresCalculationGroupContext(group,
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
@@ -271,7 +271,7 @@
             var group = new CalculationGroup();
             var parentGroup = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var groupContext = new HeightStructuresCalculationGroupContext(group,
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
@@ -316,7 +316,7 @@
             var group = new CalculationGroup();
             var parentGroup = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var groupContext = new HeightStructuresCalculationGroupContext(group,
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
@@ -370,7 +370,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var group = new CalculationGroup
             {
@@ -425,8 +425,8 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = null;
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
@@ -473,8 +473,8 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
@@ -530,8 +530,8 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
@@ -563,7 +563,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var group = new CalculationGroup
             {
@@ -618,8 +618,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
@@ -666,8 +665,8 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
@@ -723,8 +722,8 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
@@ -915,7 +914,7 @@
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
                                                                        assessmentSectionMock);
@@ -962,7 +961,7 @@
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
                                                                        assessmentSectionMock);
@@ -1008,7 +1007,7 @@
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
                                                                        assessmentSectionMock);
@@ -1057,7 +1056,7 @@
             // Setup
             var observerMock = mocks.StrictMock<IObserver>();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var group = new CalculationGroup();
             var parentGroup = new CalculationGroup();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
@@ -1089,7 +1088,7 @@
         {
             // Setup
             var observerMock = mocks.StrictMock<IObserver>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var group = new CalculationGroup();
             var parentGroup = new CalculationGroup();