Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/FailurePathsStateRootContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdb619bd332bc062368ec8dc2f8eacbec4fb2d149 -r142c3fc561cfd9a2f53fe73052989655095087d8
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/FailurePathsStateRootContextTreeNodeInfoTest.cs	(.../FailurePathsStateRootContextTreeNodeInfoTest.cs)	(revision db619bd332bc062368ec8dc2f8eacbec4fb2d149)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/FailurePathsStateRootContextTreeNodeInfoTest.cs	(.../FailurePathsStateRootContextTreeNodeInfoTest.cs)	(revision 142c3fc561cfd9a2f53fe73052989655095087d8)
@@ -152,6 +152,7 @@
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
+
                 // Call
                 object[] objects = info.ChildNodeObjects(context).ToArray();
 
@@ -161,16 +162,16 @@
                 var failurePathsFolder = (CategoryTreeFolder) objects[0];
                 Assert.AreEqual("Faalpaden", failurePathsFolder.Name);
                 Assert.AreEqual(TreeFolderCategory.General, failurePathsFolder.Category);
-                
+
                 Assert.AreEqual(2, failurePathsFolder.Contents.Count());
-                var pipingFailurePathContext = (PipingFailurePathContext) failurePathsFolder.Contents.ElementAt(0); 
+                var pipingFailurePathContext = (PipingFailurePathContext) failurePathsFolder.Contents.ElementAt(0);
                 Assert.AreSame(assessmentSection.Piping, pipingFailurePathContext.WrappedData);
                 Assert.AreSame(assessmentSection, pipingFailurePathContext.Parent);
-                
-                var grassCoverErosionInwardsFailurePathContext = (GrassCoverErosionInwardsFailurePathContext) failurePathsFolder.Contents.ElementAt(1); 
+
+                var grassCoverErosionInwardsFailurePathContext = (GrassCoverErosionInwardsFailurePathContext) failurePathsFolder.Contents.ElementAt(1);
                 Assert.AreSame(assessmentSection.GrassCoverErosionInwards, grassCoverErosionInwardsFailurePathContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverErosionInwardsFailurePathContext.Parent);
-                
+
                 var assemblyResultsContext = (AssemblyResultsContext) objects[1];
                 Assert.AreSame(assessmentSection, assemblyResultsContext.WrappedData);
             }
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rd88854c89ab5e8cfcbaa7e74c247c5e7b2ec337d -r142c3fc561cfd9a2f53fe73052989655095087d8
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision d88854c89ab5e8cfcbaa7e74c247c5e7b2ec337d)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 142c3fc561cfd9a2f53fe73052989655095087d8)
@@ -788,13 +788,15 @@
 
         private static object[] CalculationsChildNodeObjects(PipingCalculationsContext context)
         {
-            PipingFailureMechanism wrappedData = context.WrappedData;
+            PipingFailureMechanism failureMechanism = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
 
             return new object[]
             {
-                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetCalculationsInputs(wrappedData, assessmentSection), TreeFolderCategory.Input),
-                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData.SurfaceLines, wrappedData.StochasticSoilModels, wrappedData, assessmentSection)
+                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
+                                       GetCalculationsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
+                new PipingCalculationGroupContext(failureMechanism.CalculationsGroup, null,failureMechanism.SurfaceLines,
+                                                  failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection)
             };
         }
 
@@ -872,13 +874,15 @@
 
         private static object[] FailurePathChildNodeObjects(PipingFailurePathContext context)
         {
-            PipingFailureMechanism wrappedData = context.WrappedData;
+            PipingFailureMechanism failureMechanism = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
 
             return new object[]
             {
-                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetFailurePathInputs(wrappedData, assessmentSection), TreeFolderCategory.Input),
-                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetFailurePathOutputs(wrappedData, assessmentSection), TreeFolderCategory.Output)
+                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
+                                       GetFailurePathInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
+                new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName,
+                                       GetFailurePathOutputs(failureMechanism, assessmentSection), TreeFolderCategory.Output)
             };
         }
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc96c84bcf4cad9cba0d75dcd299b1e62bd9d925e -r142c3fc561cfd9a2f53fe73052989655095087d8
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs	(.../PipingCalculationsContextTreeNodeInfoTest.cs)	(revision c96c84bcf4cad9cba0d75dcd299b1e62bd9d925e)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs	(.../PipingCalculationsContextTreeNodeInfoTest.cs)	(revision 142c3fc561cfd9a2f53fe73052989655095087d8)
@@ -99,7 +99,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsName()
+        public void Text_WithContext_ReturnsName()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -128,7 +128,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnChildDataNodes()
+        public void ChildNodeObjects_WithContext_ReturnChildDataNodes()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
@@ -544,7 +544,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_WithContext_CallsContextMenuBuilderMethods()
         {
             // Setup
             using (var treeViewControl = new TreeViewControl())
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9b051949cbf6a942013de2e4ff17ee40e768b4fc -r142c3fc561cfd9a2f53fe73052989655095087d8
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 9b051949cbf6a942013de2e4ff17ee40e768b4fc)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 142c3fc561cfd9a2f53fe73052989655095087d8)
@@ -86,7 +86,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsName()
+        public void Text_WithContext_ReturnsName()
         {
             // Setup
             var mocks = new MockRepository();
@@ -114,7 +114,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnChildDataNodes()
+        public void ChildNodeObjects_WithContext_ReturnChildDataNodes()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
@@ -172,7 +172,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_WithContext_CallsContextMenuBuilderMethods()
         {
             // Setup
             var mocks = new MockRepository();