Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1c8a44983627b9d580cbbeab3c8444c5ecc41524 -rb60b7e12cf211bdbe11e0a54734fa097e8ef2146
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 1c8a44983627b9d580cbbeab3c8444c5ecc41524)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision b60b7e12cf211bdbe11e0a54734fa097e8ef2146)
@@ -95,8 +95,8 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new HeightStructuresCalculation();
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
             var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Call
@@ -125,11 +125,12 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new HeightStructuresCalculation
+            var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput)
             {
                 Output = new HeightStructuresOutput()
             };
-            var failureMechanism = new HeightStructuresFailureMechanism();
+
             var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Call
@@ -160,7 +161,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
@@ -199,7 +200,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -234,8 +235,8 @@
         {
             // Setup
             var group = new CalculationGroup();
-            var elementToBeRemoved = new HeightStructuresCalculation();
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var elementToBeRemoved = new HeightStructuresCalculation(failureMechanism.GeneralInput);
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculationContext = new HeightStructuresCalculationContext(elementToBeRemoved,
@@ -250,7 +251,7 @@
             mocks.ReplayAll();
 
             group.Children.Add(elementToBeRemoved);
-            group.Children.Add(new HeightStructuresCalculation());
+            group.Children.Add(new HeightStructuresCalculation(failureMechanism.GeneralInput));
             group.Attach(observerMock);
 
             // Precondition