Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rcacdb7e4c96c30b4b7f7867570114ecb73d2be7a -ra73589ae2d5ade2d5fe3e494267d7e4e295a34bc
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision cacdb7e4c96c30b4b7f7867570114ecb73d2be7a)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision a73589ae2d5ade2d5fe3e494267d7e4e295a34bc)
@@ -1158,13 +1158,13 @@
                                                                                  .Build()
             };
 
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<MicrostabilityFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<PipingStructureFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<TechnicalInnovationFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultTreeNodeInfo<WaterPressureAsphaltCoverFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<MicrostabilityFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultTreeNodeInfo<PipingStructureFailureMechanismSectionResultContext, NonAdoptableFailureMechanismSectionResult>();
+            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<TechnicalInnovationFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<WaterPressureAsphaltCoverFailureMechanismSectionResultOld>();
 
             yield return new TreeNodeInfo<ProbabilityFailureMechanismSectionResultContext<MacroStabilityOutwardsFailureMechanismSectionResultOld>>
             {
@@ -1327,7 +1327,21 @@
             };
         }
 
-        private TreeNodeInfo<FailureMechanismSectionResultContext<T>> CreateFailureMechanismSectionResultTreeNodeInfo<T>()
+        private TreeNodeInfo<TContext> CreateFailureMechanismSectionResultTreeNodeInfo<TContext, TSectionResult>()
+            where TContext : ProbabilityFailureMechanismSectionResultContext<TSectionResult>
+            where TSectionResult : NonAdoptableFailureMechanismSectionResult
+        {
+            return new TreeNodeInfo<TContext>
+            {
+                Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
+                Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon,
+                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
+                                                                                 .AddOpenItem()
+                                                                                 .Build()
+            };
+        }
+
+        private TreeNodeInfo<FailureMechanismSectionResultContext<T>> CreateFailureMechanismSectionResultOldTreeNodeInfo<T>()
             where T : FailureMechanismSectionResultOld
         {
             return new TreeNodeInfo<FailureMechanismSectionResultContext<T>>
@@ -2521,17 +2535,16 @@
             };
         }
 
-        private static IEnumerable<object> GetPipingStructureFailurePathOutputs(PipingStructureFailureMechanism nodeData,
+        private static IEnumerable<object> GetPipingStructureFailurePathOutputs(PipingStructureFailureMechanism failureMechanism,
                                                                                 IAssessmentSection assessmentSection)
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(nodeData,
-                                                              assessmentSection,
-                                                              () => nodeData.GeneralInput.N),
-                new ProbabilityFailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResultOld>(
-                    nodeData.SectionResultsOld, nodeData, assessmentSection),
-                nodeData.InAssemblyOutputComments
+                new FailureMechanismAssemblyCategoriesContext(
+                    failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
+                new PipingStructureFailureMechanismSectionResultContext(
+                    failureMechanism.SectionResults, failureMechanism, assessmentSection),
+                failureMechanism.InAssemblyOutputComments
             };
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r27e15c66ffe310fa9ae3fb77ad8aa0b30e6b3cd0 -ra73589ae2d5ade2d5fe3e494267d7e4e295a34bc
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 27e15c66ffe310fa9ae3fb77ad8aa0b30e6b3cd0)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision a73589ae2d5ade2d5fe3e494267d7e4e295a34bc)
@@ -660,7 +660,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResultOld>)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResultOld>)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingStructureFailureMechanismSectionResultContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<TechnicalInnovationFailureMechanismSectionResultOld>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultOld>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResultOld>)));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -ra73589ae2d5ade2d5fe3e494267d7e4e295a34bc
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision a73589ae2d5ade2d5fe3e494267d7e4e295a34bc)
@@ -27,96 +27,95 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Plugin.TestUtil;
-using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
+using Riskeer.Integration.Forms.PresentationObjects;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
 {
     [TestFixture]
     public class PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest
     {
+        private MockRepository mocks;
         private RiskeerPlugin plugin;
         private TreeNodeInfo info;
 
         [SetUp]
         public void SetUp()
         {
+            mocks = new MockRepository();
             plugin = new RiskeerPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResultOld>));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingStructureFailureMechanismSectionResultContext));
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+            mocks.VerifyAll();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Setup
-            using (plugin)
-            {
-                // Assert
-                Assert.IsNotNull(info.Text);
-                Assert.IsNull(info.ForeColor);
-                Assert.IsNotNull(info.Image);
-                Assert.IsNotNull(info.ContextMenuStrip);
-                Assert.IsNull(info.EnsureVisibleOnCreate);
-                Assert.IsNull(info.ExpandOnCreate);
-                Assert.IsNull(info.ChildNodeObjects);
-                Assert.IsNull(info.CanRename);
-                Assert.IsNull(info.OnNodeRenamed);
-                Assert.IsNull(info.CanRemove);
-                Assert.IsNull(info.OnNodeRemoved);
-                Assert.IsNull(info.CanCheck);
-                Assert.IsNull(info.CheckedState);
-                Assert.IsNull(info.OnNodeChecked);
-                Assert.IsNull(info.CanDrag);
-                Assert.IsNull(info.CanDrop);
-                Assert.IsNull(info.CanInsert);
-                Assert.IsNull(info.OnDrop);
-            }
+            mocks.ReplayAll();
+
+            // Assert
+            Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.CheckedState);
+            Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNull(info.CanDrag);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
         }
 
         [Test]
         public void Text_Always_ReturnsName()
         {
             // Setup
-            var mechanism = new PipingStructureFailureMechanism();
-            var context = new FailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResultOld>(mechanism.SectionResultsOld,
-                                                                                                                 mechanism);
-            using (plugin)
-            {
-                // Call
-                string text = info.Text(context);
+            mocks.ReplayAll();
 
-                // Assert
-                Assert.AreEqual("Resultaat", text);
-            }
+            // Call
+            string text = info.Text(null);
+
+            // Assert
+            Assert.AreEqual("Resultaat", text);
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
             // Setup
-            using (plugin)
-            {
-                // Call
-                Image image = info.Image(null);
+            mocks.ReplayAll();
 
-                // Assert
-                TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image);
-            }
+            // Call
+            Image image = info.Image(null);
+
+            // Assert
+            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
         public void ContextMenuStrip_Always_CallsBuilder()
         {
             // Setup
-            var mocks = new MockRepository();
             var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder);
             menuBuilder.Expect(mb => mb.Build()).Return(null);
 
-            using (plugin)
             using (var treeViewControl = new TreeViewControl())
             {
                 IGui gui = StubFactory.CreateGuiStub(mocks);
@@ -131,7 +130,7 @@
             }
 
             // Assert
-            mocks.VerifyAll();
+            // Assert expectancies are called in TearDown()
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4 -ra73589ae2d5ade2d5fe3e494267d7e4e295a34bc
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailurePathContextTreeNodeInfoTest.cs	(.../PipingStructureFailurePathContextTreeNodeInfoTest.cs)	(revision c1abb917d71d2f88c24ecdaa5a74d7ccbdd392f4)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailurePathContextTreeNodeInfoTest.cs	(.../PipingStructureFailurePathContextTreeNodeInfoTest.cs)	(revision a73589ae2d5ade2d5fe3e494267d7e4e295a34bc)
@@ -36,7 +36,7 @@
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Plugin.TestUtil;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
+using Riskeer.Integration.Forms.PresentationObjects;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -182,10 +182,10 @@
                 Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
             }
 
-            var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<PipingStructureFailureMechanismSectionResultOld>)
+            var failureMechanismResultsContext = (PipingStructureFailureMechanismSectionResultContext)
                 outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
-            Assert.AreSame(failureMechanism.SectionResultsOld, failureMechanismResultsContext.WrappedData);
+            Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
             var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);