Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -rd8e2d6a982327c979ef74dcf7cc71a8a69314eef
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision d8e2d6a982327c979ef74dcf7cc71a8a69314eef)
@@ -436,7 +436,8 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection),
-                new StochasticSoilModelContext(failureMechanism, assessmentSection)
+                new StochasticSoilModelContext(failureMechanism, assessmentSection),
+                new CommentContext<IComment>(failureMechanism)
             };
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -rd8e2d6a982327c979ef74dcf7cc71a8a69314eef
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision a9aafffab97152303562110b1d789bacb465ce24)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision d8e2d6a982327c979ef74dcf7cc71a8a69314eef)
@@ -140,7 +140,8 @@
             var inputsFolder = (CategoryTreeFolder) children[0];
             Assert.AreEqual("Invoer", inputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Input, inputsFolder.Category);
-
+            
+            Assert.AreEqual(4, inputsFolder.Contents.Count);
             var failureMechanismSectionsContext = (FailureMechanismSectionsContext) inputsFolder.Contents[0];
             CollectionAssert.AreEqual(pipingFailureMechanism.Sections, failureMechanismSectionsContext.WrappedData);
             Assert.AreSame(pipingFailureMechanism, failureMechanismSectionsContext.ParentFailureMechanism);
@@ -154,6 +155,9 @@
             Assert.AreSame(pipingFailureMechanism, stochasticSoilModelContext.FailureMechanism);
             Assert.AreSame(assessmentSection, stochasticSoilModelContext.AssessmentSection);
 
+            var commentContext = (CommentContext<IComment>) inputsFolder.Contents[3];
+            Assert.AreSame(pipingFailureMechanism, commentContext.CommentContainer);
+
             var calculationsFolder = (PipingCalculationGroupContext) children[1];
             Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
             CollectionAssert.AreEqual(pipingFailureMechanism.CalculationsGroup.Children, calculationsFolder.WrappedData.Children);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs
===================================================================
diff -u -rc116b4635603c6d5bbdedb837f68fd3839ece6ca -rd8e2d6a982327c979ef74dcf7cc71a8a69314eef
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision c116b4635603c6d5bbdedb837f68fd3839ece6ca)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision d8e2d6a982327c979ef74dcf7cc71a8a69314eef)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls.TreeView;
@@ -29,8 +28,6 @@
 using Core.Common.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Common.Data;
-using Ringtoets.Common.Forms.Views;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;