Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r4a605638b6887f870e827abd3adf1f365d8f8c93 -rc62bff4ec2aab16d09f765bd47b4fde9b36a2fd7
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 4a605638b6887f870e827abd3adf1f365d8f8c93)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision c62bff4ec2aab16d09f765bd47b4fde9b36a2fd7)
@@ -1143,7 +1143,7 @@
 
             yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>();
             yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>();
-            yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<MicrostabilityFailureMechanismSectionResultOld>();
+            yield return CreateFailureMechanismSectionResultTreeNodeInfo<MicrostabilityFailureMechanismSectionResultContext, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>();
             yield return CreateFailureMechanismSectionResultTreeNodeInfo<PipingStructureFailureMechanismSectionResultContext, NonAdoptableFailureMechanismSectionResult>();
             yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<TechnicalInnovationFailureMechanismSectionResultOld>();
             yield return CreateFailureMechanismSectionResultOldTreeNodeInfo<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultOld>();
@@ -2505,7 +2505,7 @@
                                        GetMicrostabilityFailurePathInputs(nodeData.WrappedData, nodeData.Parent),
                                        TreeFolderCategory.Input),
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName,
-                                       GetMicrostabilityFailurePathOutputs(nodeData.WrappedData),
+                                       GetMicrostabilityFailurePathOutputs(nodeData.WrappedData, nodeData.Parent),
                                        TreeFolderCategory.Output)
             };
         }
@@ -2519,13 +2519,12 @@
             };
         }
 
-        private static IEnumerable<object> GetMicrostabilityFailurePathOutputs(MicrostabilityFailureMechanism nodeData)
+        private static IEnumerable<object> GetMicrostabilityFailurePathOutputs(MicrostabilityFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new object[]
             {
-                new FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResultOld>(
-                    nodeData.SectionResultsOld, nodeData),
-                nodeData.InAssemblyOutputComments
+                new MicrostabilityFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection),
+                failureMechanism.InAssemblyOutputComments
             };
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r5b941613b2c556e8d0a33312e9cd40f1f8d5f971 -rc62bff4ec2aab16d09f765bd47b4fde9b36a2fd7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 5b941613b2c556e8d0a33312e9cd40f1f8d5f971)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision c62bff4ec2aab16d09f765bd47b4fde9b36a2fd7)
@@ -653,7 +653,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ForeshoreProfile)));
                 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(MicrostabilityFailureMechanismSectionResultContext)));
                 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>)));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rca9d1b4a3ae4d86d87cb47acbf359ce3e9bfa933 -rc62bff4ec2aab16d09f765bd47b4fde9b36a2fd7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision ca9d1b4a3ae4d86d87cb47acbf359ce3e9bfa933)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision c62bff4ec2aab16d09f765bd47b4fde9b36a2fd7)
@@ -27,9 +27,8 @@
 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.SectionResults;
+using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
 namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos
@@ -44,63 +43,57 @@
         public void SetUp()
         {
             plugin = new RiskeerPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResultOld>));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(MicrostabilityFailureMechanismSectionResultContext));
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
         [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);
-            }
+            // 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
-            using (plugin)
-            {
-                // Call
-                string text = info.Text(null);
+            // Call
+            string text = info.Text(null);
 
-                // Assert
-                Assert.AreEqual("Resultaat", text);
-            }
+            // Assert
+            Assert.AreEqual("Resultaat", text);
         }
 
         [Test]
         public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
-            // Setup
-            using (plugin)
-            {
-                // Call
-                Image image = info.Image(null);
+            // Call
+            Image image = info.Image(null);
 
-                // Assert
-                TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image);
-            }
+            // Assert
+            TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
@@ -112,7 +105,7 @@
             menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder);
             menuBuilder.Expect(mb => mb.Build()).Return(null);
 
-            using (plugin)
+            using (plugin) // This is needed to prevent interference from mocks in dispose
             using (var treeViewControl = new TreeViewControl())
             {
                 IGui gui = StubFactory.CreateGuiStub(mocks);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rc62bff4ec2aab16d09f765bd47b4fde9b36a2fd7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailurePathContextTreeNodeInfoTest.cs	(.../MicrostabilityFailurePathContextTreeNodeInfoTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailurePathContextTreeNodeInfoTest.cs	(.../MicrostabilityFailurePathContextTreeNodeInfoTest.cs)	(revision c62bff4ec2aab16d09f765bd47b4fde9b36a2fd7)
@@ -32,7 +32,6 @@
 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.StandAlone;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -166,10 +165,11 @@
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismResultsContext = (FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResultOld>)
+            var failureMechanismResultsContext = (MicrostabilityFailureMechanismSectionResultContext)
                 outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
-            Assert.AreSame(failureMechanism.SectionResultsOld, failureMechanismResultsContext.WrappedData);
+            Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
+            Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
             var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);