Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed -rbda5bee40c8a756d444e5aeba5907e2617e76f00
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision bda5bee40c8a756d444e5aeba5907e2617e76f00)
@@ -196,10 +196,10 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var calculationItem = mocks.StrictMock<ICalculationBase>();
             mocks.ReplayAll();
 
             var childGroup = new CalculationGroup();
+            var calculationItem = new GrassCoverErosionOutwardsWaveConditionsCalculation();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationItem);
@@ -215,11 +215,18 @@
 
             // Assert
             Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Children.Count, children.Length);
-            Assert.AreSame(calculationItem, children[0]);
+
+            var returnedCalculationContext = (GrassCoverErosionOutwardsWaveConditionsCalculationContext) children[0];
+            Assert.AreSame(calculationItem, returnedCalculationContext.WrappedData);
+            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationContext.Parent);
+            Assert.AreSame(failureMechanism, returnedCalculationContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, returnedCalculationContext.AssessmentSection);
+
             var returnedCalculationGroupContext = (GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) children[1];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);
             Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationGroupContext.Parent);
             Assert.AreSame(failureMechanism, returnedCalculationGroupContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, returnedCalculationGroupContext.AssessmentSection);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed -rbda5bee40c8a756d444e5aeba5907e2617e76f00
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs	(.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs)	(revision b6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs	(.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs)	(revision bda5bee40c8a756d444e5aeba5907e2617e76f00)
@@ -183,15 +183,19 @@
             Assert.AreEqual(3, children.Length);
             var waterLevelHydraulicBoundaryLocationsContext = (GrassCoverErosionOutwardsDesignWaterLevelLocationsContext) children[0];
             Assert.AreSame(failureMechanism.HydraulicBoundaryLocations, waterLevelHydraulicBoundaryLocationsContext.WrappedData);
+            Assert.AreSame(failureMechanism, waterLevelHydraulicBoundaryLocationsContext.FailureMechanism);
             Assert.AreSame(assessmentSection, waterLevelHydraulicBoundaryLocationsContext.AssessmentSection);
 
             var waveHeightHydraulicBoundaryLocationsContext = (GrassCoverErosionOutwardsWaveHeightLocationsContext) children[1];
             Assert.AreSame(failureMechanism.HydraulicBoundaryLocations, waveHeightHydraulicBoundaryLocationsContext.WrappedData);
+            Assert.AreSame(failureMechanism, waveHeightHydraulicBoundaryLocationsContext.FailureMechanism);
             Assert.AreSame(assessmentSection, waveHeightHydraulicBoundaryLocationsContext.AssessmentSection);
 
             var waveConditionsCalculationGroupContext = (GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) children[2];
             Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, waveConditionsCalculationGroupContext.WrappedData);
             Assert.IsNull(waveConditionsCalculationGroupContext.Parent);
+            Assert.AreSame(failureMechanism, waveConditionsCalculationGroupContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, waveConditionsCalculationGroupContext.AssessmentSection);
         }
 
         [Test]
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed -rbda5bee40c8a756d444e5aeba5907e2617e76f00
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision bda5bee40c8a756d444e5aeba5907e2617e76f00)
@@ -209,6 +209,7 @@
             Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, hydraulicBoundariesCalculationGroup.WrappedData);
             Assert.IsNull(hydraulicBoundariesCalculationGroup.Parent);
             Assert.AreSame(failureMechanism, hydraulicBoundariesCalculationGroup.FailureMechanism);
+            Assert.AreSame(assessmentSection, hydraulicBoundariesCalculationGroup.AssessmentSection);
 
             var outputsFolder = (CategoryTreeFolder) children[2];
             Assert.AreEqual("Oordeel", outputsFolder.Name);
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed -rbda5bee40c8a756d444e5aeba5907e2617e76f00
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision bda5bee40c8a756d444e5aeba5907e2617e76f00)
@@ -172,10 +172,10 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var calculationItem = mocks.StrictMock<ICalculationBase>();
             mocks.ReplayAll();
 
             var childGroup = new CalculationGroup();
+            var calculationItem = new StabilityStoneCoverWaveConditionsCalculation();
 
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationItem);
@@ -191,11 +191,18 @@
 
             // Assert
             Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Children.Count, children.Length);
-            Assert.AreSame(calculationItem, children[0]);
+
+            var returnedCalculationContext = (StabilityStoneCoverWaveConditionsCalculationContext) children[0];
+            Assert.AreSame(calculationItem, returnedCalculationContext.WrappedData);
+            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationContext.Parent);
+            Assert.AreSame(failureMechanism, returnedCalculationContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, returnedCalculationContext.AssessmentSection);
+
             var returnedCalculationGroupContext = (StabilityStoneCoverWaveConditionsCalculationGroupContext) children[1];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);
             Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationGroupContext.Parent);
             Assert.AreSame(failureMechanism, returnedCalculationGroupContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, returnedCalculationGroupContext.AssessmentSection);
         }
 
         [Test]
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed -rbda5bee40c8a756d444e5aeba5907e2617e76f00
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision bda5bee40c8a756d444e5aeba5907e2617e76f00)
@@ -226,6 +226,7 @@
                 Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, hydraulicBoundariesCalculationGroup.WrappedData);
                 Assert.IsNull(hydraulicBoundariesCalculationGroup.Parent);
                 Assert.AreSame(failureMechanism, hydraulicBoundariesCalculationGroup.FailureMechanism);
+                Assert.AreSame(assessmentSection, hydraulicBoundariesCalculationGroup.AssessmentSection);
 
                 var outputsFolder = (CategoryTreeFolder) children[2];
                 Assert.AreEqual("Oordeel", outputsFolder.Name);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed -rbda5bee40c8a756d444e5aeba5907e2617e76f00
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b6e6c2d3cc811c3365c0265d1ccd70f2ebac99ed)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision bda5bee40c8a756d444e5aeba5907e2617e76f00)
@@ -195,10 +195,10 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var calculationItem = mocks.StrictMock<ICalculationBase>();
             mocks.ReplayAll();
 
             var childGroup = new CalculationGroup();
+            var calculationItem = new WaveImpactAsphaltCoverWaveConditionsCalculation();
 
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationItem);
@@ -214,11 +214,18 @@
 
             // Assert
             Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Children.Count, children.Length);
-            Assert.AreSame(calculationItem, children[0]);
+
+            var returnedCalculationContext = (WaveImpactAsphaltCoverWaveConditionsCalculationContext) children[0];
+            Assert.AreSame(calculationItem, returnedCalculationContext.WrappedData);
+            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationContext.Parent);
+            Assert.AreSame(failureMechanism, returnedCalculationContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, returnedCalculationContext.AssessmentSection);
+
             var returnedCalculationGroupContext = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) children[1];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);
             Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationGroupContext.Parent);
             Assert.AreSame(failureMechanism, returnedCalculationGroupContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, returnedCalculationGroupContext.AssessmentSection);
         }
 
         [Test]