Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -ra5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision a5bf4f56dbf07e5cf48d0b874f5d46d7d02f0dba)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs	(.../StandAloneFailureMechanismPropertyInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -54,7 +54,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(FailureMechanismContext<IFailureMechanism>), info.DataType);
+            Assert.AreEqual(typeof(IFailureMechanismContext<IFailureMechanism>), info.DataType);
             Assert.AreEqual(typeof(StandAloneFailureMechanismProperties), info.PropertyObjectType);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -r83533c155d88de10f0a8e37e3918effc0725ba77 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 83533c155d88de10f0a8e37e3918effc0725ba77)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -113,7 +113,6 @@
     <Compile Include="TreeNodeInfos\NormContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\PipingStructureFailureMechanismContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs" />
-    <Compile Include="TreeNodeInfos\FailureMechanismContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismContributionContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\FailureMechanismSectionsContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\ForeshoreProfilesContextTreeNodeInfoTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r598b39e0bdadfeae788543a07aa8a5ef35670413 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 598b39e0bdadfeae788543a07aa8a5ef35670413)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -256,7 +256,7 @@
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
-                    typeof(FailureMechanismContext<IFailureMechanism>),
+                    typeof(IFailureMechanismContext<IFailureMechanism>),
                     typeof(StandAloneFailureMechanismProperties));
 
                 PluginTestHelper.AssertPropertyInfoDefined(
@@ -513,7 +513,7 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(39, treeNodeInfos.Length);
+                Assert.AreEqual(38, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(BackgroundData)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(NormContext)));
@@ -639,8 +639,16 @@
                 UpdateInfo[] updateInfos = plugin.GetUpdateInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(1, updateInfos.Length);
+                Assert.AreEqual(9, updateInfos.Length);
                 Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(ForeshoreProfilesContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(GrassCoverSlipOffInwardsFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(GrassCoverSlipOffOutwardsFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(MacroStabilityOutwardsFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(MicrostabilityFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(PipingStructureFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(TechnicalInnovationFailureMechanismSectionsContext)));
+                Assert.IsTrue(updateInfos.Any(i => i.DataType == typeof(WaterPressureAsphaltCoverFailureMechanismSectionsContext)));
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r3d1b482e4e8307e869128eca15b9bab300bea099 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 3d1b482e4e8307e869128eca15b9bab300bea099)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -257,7 +257,7 @@
                 Assert.AreSame(assessmentSection.MacroStabilityOutwards, macroStabilityOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, macroStabilityOutwardsFailureMechanismContext.Parent);
 
-                var microstabilityFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[10];
+                var microstabilityFailureMechanismContext = (MicrostabilityFailureMechanismContext) objects[10];
                 Assert.AreSame(assessmentSection.Microstability, microstabilityFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, microstabilityFailureMechanismContext.Parent);
 
@@ -269,19 +269,19 @@
                 Assert.AreSame(assessmentSection.WaveImpactAsphaltCover, waveImpactAsphaltCoverFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, waveImpactAsphaltCoverFailureMechanismContext.Parent);
 
-                var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[13];
+                var waterPressureAsphaltCoverFailureMechanismContext = (WaterPressureAsphaltCoverFailureMechanismContext) objects[13];
                 Assert.AreSame(assessmentSection.WaterPressureAsphaltCover, waterPressureAsphaltCoverFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, waterPressureAsphaltCoverFailureMechanismContext.Parent);
 
                 var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext) objects[14];
                 Assert.AreSame(assessmentSection.GrassCoverErosionOutwards, grassCoverErosionOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverErosionOutwardsFailureMechanismContext.Parent);
 
-                var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[15];
+                var grassCoverSlipOffOutwardsFailureMechanismContext = (GrassCoverSlipOffOutwardsFailureMechanismContext) objects[15];
                 Assert.AreSame(assessmentSection.GrassCoverSlipOffOutwards, grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent);
 
-                var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[16];
+                var grassCoverSlipOffInwardsFailureMechanismContext = (GrassCoverSlipOffInwardsFailureMechanismContext) objects[16];
                 Assert.AreSame(assessmentSection.GrassCoverSlipOffInwards, grassCoverSlipOffInwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent);
 
@@ -301,15 +301,15 @@
                 Assert.AreSame(assessmentSection.StabilityPointStructures, stabilityPointStructuresFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, stabilityPointStructuresFailureMechanismContext.Parent);
 
-                var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[21];
+                var strengthStabilityLengthwiseConstructionFailureMechanismContext = (StrengthStabilityLengthwiseConstructionFailureMechanismContext) objects[21];
                 Assert.AreSame(assessmentSection.StrengthStabilityLengthwiseConstruction, strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent);
 
                 var duneErosionFailureMechanismContext = (DuneErosionFailureMechanismContext) objects[22];
                 Assert.AreSame(assessmentSection.DuneErosion, duneErosionFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, duneErosionFailureMechanismContext.Parent);
 
-                var technicalInnovationFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[23];
+                var technicalInnovationFailureMechanismContext = (TechnicalInnovationFailureMechanismContext) objects[23];
                 Assert.AreSame(assessmentSection.TechnicalInnovation, technicalInnovationFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent);
 
Fisheye: Tag b70aa5e9027d1358a2dc38029c2eadae3d3eed4c refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -168,20 +168,16 @@
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<GrassCoverSlipOffInwardsFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -168,20 +168,16 @@
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs	(.../MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -168,20 +168,16 @@
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<MicrostabilityFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -168,20 +168,16 @@
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs	(.../TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs	(.../TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -168,20 +168,16 @@
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<TechnicalInnovationFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8 -rb70aa5e9027d1358a2dc38029c2eadae3d3eed4c
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6e6ff0259ba700bb1fe6e60cc47cf9741e8815b8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision b70aa5e9027d1358a2dc38029c2eadae3d3eed4c)
@@ -168,20 +168,16 @@
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (GeotechnicalFailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputComment = (Comment) outputFolder.Contents.ElementAt(2);
+            var outputComment = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }