Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf12c822255b5fc8c5a3e53f13a02a370bbdbd5e9 -re00484c4cdf27ed48622b83c78bbf2eedf02f1df
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs)	(revision f12c822255b5fc8c5a3e53f13a02a370bbdbd5e9)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs)	(revision e00484c4cdf27ed48622b83c78bbf2eedf02f1df)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -340,9 +339,7 @@
             {
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-                var data = mocks.StrictMock<MacroStabilityInwardsFailureMechanism>();
-                data.Stub(dm => dm.Calculations).Return(Array.Empty<ICalculation>());
-
+                var data = new MacroStabilityInwardsFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var context = new MacroStabilityInwardsCalculationsContext(data, assessmentSection);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf12c822255b5fc8c5a3e53f13a02a370bbdbd5e9 -re00484c4cdf27ed48622b83c78bbf2eedf02f1df
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs	(.../PipingCalculationsContextTreeNodeInfoTest.cs)	(revision f12c822255b5fc8c5a3e53f13a02a370bbdbd5e9)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs	(.../PipingCalculationsContextTreeNodeInfoTest.cs)	(revision e00484c4cdf27ed48622b83c78bbf2eedf02f1df)
@@ -353,11 +353,8 @@
             {
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-                var failureMechanism = mocks.StrictMock<PipingFailureMechanism>();
-                failureMechanism.Stub(dm => dm.Calculations).Return(new[]
-                {
-                    new TestPipingCalculationScenario()
-                });
+                var failureMechanism = new PipingFailureMechanism();
+                failureMechanism.CalculationsGroup.Children.Add(new TestPipingCalculationScenario());
 
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var context = new PipingCalculationsContext(failureMechanism, assessmentSection);