Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r2e86ca48e8a12dcb456f0440fd5834de60ae13df -r37de32e433cd0940e567c8cca7aa79bfe03122ab
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 2e86ca48e8a12dcb456f0440fd5834de60ae13df)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 37de32e433cd0940e567c8cca7aa79bfe03122ab)
@@ -147,6 +147,7 @@
                 // Assert
                 Assert.IsTrue(result);
             }
+
             mocks.VerifyAll();
         }
 
@@ -166,6 +167,7 @@
                 // Assert
                 Assert.IsTrue(result);
             }
+
             mocks.VerifyAll();
         }
 
@@ -182,93 +184,97 @@
                 object[] objects = info.ChildNodeObjects(assessmentSection).ToArray();
 
                 // Assert
-                Assert.AreEqual(23, objects.Length);
+                Assert.AreEqual(24, objects.Length);
 
                 var referenceLineContext = (ReferenceLineContext) objects[0];
                 Assert.AreSame(assessmentSection, referenceLineContext.WrappedData);
 
-                var contributionContext = (FailureMechanismContributionContext) objects[1];
+                var normContext = (NormContext) objects[1];
+                Assert.AreSame(assessmentSection.FailureMechanismContribution, normContext.WrappedData);
+                Assert.AreSame(assessmentSection, normContext.AssessmentSection);
+
+                var contributionContext = (FailureMechanismContributionContext) objects[2];
                 Assert.AreSame(assessmentSection.FailureMechanismContribution, contributionContext.WrappedData);
                 Assert.AreSame(assessmentSection, contributionContext.Parent);
 
-                var context = (HydraulicBoundaryDatabaseContext) objects[2];
+                var context = (HydraulicBoundaryDatabaseContext) objects[3];
                 Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.WrappedData);
                 Assert.AreSame(assessmentSection, context.AssessmentSection);
 
-                var backgroundData = (BackgroundData) objects[3];
+                var backgroundData = (BackgroundData) objects[4];
                 Assert.AreSame(assessmentSection.BackgroundData, backgroundData);
 
-                var comment = (Comment) objects[4];
+                var comment = (Comment) objects[5];
                 Assert.AreSame(assessmentSection.Comments, comment);
 
-                var pipingFailureMechanismContext = (PipingFailureMechanismContext) objects[5];
+                var pipingFailureMechanismContext = (PipingFailureMechanismContext) objects[6];
                 Assert.AreSame(assessmentSection.Piping, pipingFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, pipingFailureMechanismContext.Parent);
 
-                var grassCoverErosionInwardsFailureMechanismContext = (GrassCoverErosionInwardsFailureMechanismContext) objects[6];
+                var grassCoverErosionInwardsFailureMechanismContext = (GrassCoverErosionInwardsFailureMechanismContext) objects[7];
                 Assert.AreSame(assessmentSection.GrassCoverErosionInwards, grassCoverErosionInwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverErosionInwardsFailureMechanismContext.Parent);
 
-                var macroStabilityInwardsFailureMechanismContext = (MacroStabilityInwardsFailureMechanismContext) objects[7];
+                var macroStabilityInwardsFailureMechanismContext = (MacroStabilityInwardsFailureMechanismContext) objects[8];
                 Assert.AreSame(assessmentSection.MacroStabilityInwards, macroStabilityInwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, macroStabilityInwardsFailureMechanismContext.Parent);
 
-                var macroStabilityOutwardsFailureMechanismContext = (MacroStabilityOutwardsFailureMechanismContext) objects[8];
+                var macroStabilityOutwardsFailureMechanismContext = (MacroStabilityOutwardsFailureMechanismContext) objects[9];
                 Assert.AreSame(assessmentSection.MacroStabilityOutwards, macroStabilityOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, macroStabilityOutwardsFailureMechanismContext.Parent);
 
-                var microstabilityFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[9];
+                var microstabilityFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[10];
                 Assert.AreSame(assessmentSection.Microstability, microstabilityFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, microstabilityFailureMechanismContext.Parent);
 
-                var stabilityStoneCoverFailureMechanismContext = (StabilityStoneCoverFailureMechanismContext) objects[10];
+                var stabilityStoneCoverFailureMechanismContext = (StabilityStoneCoverFailureMechanismContext) objects[11];
                 Assert.AreSame(assessmentSection.StabilityStoneCover, stabilityStoneCoverFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, stabilityStoneCoverFailureMechanismContext.Parent);
 
-                var waveImpactAsphaltCoverFailureMechanismContext = (WaveImpactAsphaltCoverFailureMechanismContext) objects[11];
+                var waveImpactAsphaltCoverFailureMechanismContext = (WaveImpactAsphaltCoverFailureMechanismContext) objects[12];
                 Assert.AreSame(assessmentSection.WaveImpactAsphaltCover, waveImpactAsphaltCoverFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, waveImpactAsphaltCoverFailureMechanismContext.Parent);
 
-                var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[12];
+                var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[13];
                 Assert.AreSame(assessmentSection.WaterPressureAsphaltCover, waterPressureAsphaltCoverFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, waterPressureAsphaltCoverFailureMechanismContext.Parent);
 
-                var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext) objects[13];
+                var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext) objects[14];
                 Assert.AreSame(assessmentSection.GrassCoverErosionOutwards, grassCoverErosionOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverErosionOutwardsFailureMechanismContext.Parent);
 
-                var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[14];
+                var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[15];
                 Assert.AreSame(assessmentSection.GrassCoverSlipOffOutwards, grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent);
-                var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[15];
+                var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[16];
                 Assert.AreSame(assessmentSection.GrassCoverSlipOffInwards, grassCoverSlipOffInwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent);
 
-                var heightStructuresFailureMechanismContext = (HeightStructuresFailureMechanismContext) objects[16];
+                var heightStructuresFailureMechanismContext = (HeightStructuresFailureMechanismContext) objects[17];
                 Assert.AreSame(assessmentSection.HeightStructures, heightStructuresFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, heightStructuresFailureMechanismContext.Parent);
 
-                var closingStructuresFailureMechanismContext = (ClosingStructuresFailureMechanismContext) objects[17];
+                var closingStructuresFailureMechanismContext = (ClosingStructuresFailureMechanismContext) objects[18];
                 Assert.AreSame(assessmentSection.ClosingStructures, closingStructuresFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, closingStructuresFailureMechanismContext.Parent);
 
-                var pipingStructureFailureMechanismContext = (PipingStructureFailureMechanismContext) objects[18];
+                var pipingStructureFailureMechanismContext = (PipingStructureFailureMechanismContext) objects[19];
                 Assert.AreSame(assessmentSection.PipingStructure, pipingStructureFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, pipingStructureFailureMechanismContext.Parent);
 
-                var stabilityPointStructuresFailureMechanismContext = (StabilityPointStructuresFailureMechanismContext) objects[19];
+                var stabilityPointStructuresFailureMechanismContext = (StabilityPointStructuresFailureMechanismContext) objects[20];
                 Assert.AreSame(assessmentSection.StabilityPointStructures, stabilityPointStructuresFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, stabilityPointStructuresFailureMechanismContext.Parent);
 
-                var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[20];
+                var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[21];
                 Assert.AreSame(assessmentSection.StrengthStabilityLengthwiseConstruction, strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent);
 
-                var duneErosionFailureMechanismContext = (DuneErosionFailureMechanismContext) objects[21];
+                var duneErosionFailureMechanismContext = (DuneErosionFailureMechanismContext) objects[22];
                 Assert.AreSame(assessmentSection.DuneErosion, duneErosionFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, duneErosionFailureMechanismContext.Parent);
 
-                var technicalInnovationFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[22];
+                var technicalInnovationFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>) objects[23];
                 Assert.AreSame(assessmentSection.TechnicalInnovation, technicalInnovationFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent);
             }
@@ -311,6 +317,7 @@
                     info.ContextMenuStrip(null, null, treeViewControl);
                 }
             }
+
             // Assert
             mocks.VerifyAll();
         }
@@ -331,6 +338,7 @@
                 // Assert
                 Assert.IsTrue(canRename);
             }
+
             mocks.VerifyAll();
         }
 
@@ -355,6 +363,7 @@
                 // Assert
                 Assert.AreEqual(newName, assessmentSection.Name);
             }
+
             mocks.VerifyAll();
         }
 
@@ -373,6 +382,7 @@
                 // Assert
                 Assert.IsTrue(canRemove);
             }
+
             mocks.VerifyAll();
         }
 
@@ -401,6 +411,7 @@
                 // Assert
                 CollectionAssert.DoesNotContain(project.AssessmentSections, assessmentSection);
             }
+
             mocks.VerifyAll();
         }