Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r307f782511e5d6ccc9ae827882f46e4ab188cfd0 -r7a38f64b0132e6844a09d99dfa5346561c23cc33
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 307f782511e5d6ccc9ae827882f46e4ab188cfd0)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 7a38f64b0132e6844a09d99dfa5346561c23cc33)
@@ -86,7 +86,7 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
             // Call
             Image image = info.Image(null);
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2de7d7cd7d8edb8fc797645a6a5ba65b1351e608 -r7a38f64b0132e6844a09d99dfa5346561c23cc33
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2de7d7cd7d8edb8fc797645a6a5ba65b1351e608)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 7a38f64b0132e6844a09d99dfa5346561c23cc33)
@@ -96,7 +96,7 @@
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
             // Setup
             mocks.ReplayAll();
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r307f782511e5d6ccc9ae827882f46e4ab188cfd0 -r7a38f64b0132e6844a09d99dfa5346561c23cc33
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../HeightStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 307f782511e5d6ccc9ae827882f46e4ab188cfd0)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../HeightStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 7a38f64b0132e6844a09d99dfa5346561c23cc33)
@@ -76,7 +76,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsFailureMechanismSectionResultDisplayName()
+        public void Text_Always_ReturnsName()
         {
             // Call
             string text = info.Text(null);
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9df23f511e07e317ce8285fc1c77b48428e7d464 -r7a38f64b0132e6844a09d99dfa5346561c23cc33
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 9df23f511e07e317ce8285fc1c77b48428e7d464)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 7a38f64b0132e6844a09d99dfa5346561c23cc33)
@@ -27,8 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.MacroStabilityInwards.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -87,22 +85,17 @@
         public void Text_Always_ReturnsName()
         {
             // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var mechanism = new MacroStabilityInwardsFailureMechanism();
-            var context = new MacroStabilityInwardsProbabilityFailureMechanismSectionResultContext(
-                mechanism.SectionResults, mechanism, assessmentSection);
-
             // Call
-            string text = info.Text(context);
+            string text = info.Text(null);
 
             // Assert
             Assert.AreEqual("Resultaat", text);
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
             // Setup
             mocks.ReplayAll();
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1a74cf8870ea2f43e667b624b90347a5a3b71704 -r7a38f64b0132e6844a09d99dfa5346561c23cc33
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 7a38f64b0132e6844a09d99dfa5346561c23cc33)
@@ -27,8 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -87,21 +85,17 @@
         public void Text_Always_ReturnsName()
         {
             // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var mechanism = new PipingFailureMechanism();
-            var context = new PipingProbabilityFailureMechanismSectionResultContext(mechanism.SectionResults, mechanism, assessmentSection);
-
             // Call
-            string text = info.Text(context);
+            string text = info.Text(null);
 
             // Assert
             Assert.AreEqual("Resultaat", text);
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
             // Setup
             mocks.ReplayAll();