Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -rb0faaa0cb58090f64503985877b0912696c1117d -r3df200a3968f49aa1098764c284a7fafb2a14de4
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfoTest.cs	(.../DefaultFailureMechanismTreeNodeInfoTest.cs)	(revision b0faaa0cb58090f64503985877b0912696c1117d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/DefaultFailureMechanismTreeNodeInfoTest.cs	(.../DefaultFailureMechanismTreeNodeInfoTest.cs)	(revision 3df200a3968f49aa1098764c284a7fafb2a14de4)
@@ -28,32 +28,6 @@
         private const int contextMenuRelevancyIndex = 0;
 
         [Test]
-        public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismComments()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IFailureMechanism>();
-            failureMechanism.IsRelevant = false;
-
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var context = new SimpleFailureMechanismContext(failureMechanism, assessmentSection);
-
-            var treeNodeInfo = new DefaultFailureMechanismTreeNodeInfo<SimpleFailureMechanismContext, IFailureMechanism>(null, null, null);
-
-            // Call
-            object[] children = treeNodeInfo.ChildNodeObjects(context);
-
-            // Assert
-            Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext<ICommentable>)children[0];
-            Assert.AreSame(failureMechanism, commentContext.CommentContainer);
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void ContextMenuStrip_FailureMechanismIsNotRelevant_ReturnStripWithOnlyRelevancyExpandAndCollapseAllNodes()
         {
             // Setup
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6dbb29ed12c28b66db763ff603f3ab8e28a0adf4 -r3df200a3968f49aa1098764c284a7fafb2a14de4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6dbb29ed12c28b66db763ff603f3ab8e28a0adf4)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 3df200a3968f49aa1098764c284a7fafb2a14de4)
@@ -109,7 +109,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnChildDataNodes()
+        public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes()
         {
             // Setup
             var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
@@ -152,6 +152,30 @@
         }
 
         [Test]
+        public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismComments()
+        {
+            // Setup
+            var assessmentSection = mocksRepository.Stub<IAssessmentSection>();
+            mocksRepository.ReplayAll();
+
+            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism
+            {
+                IsRelevant = false
+            };
+            var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection);
+
+            // Call
+            var children = info.ChildNodeObjects(failureMechanismContext).ToArray();
+
+            // Assert
+            Assert.AreEqual(1, children.Length);
+            var commentContext = (CommentContext<ICommentable>)children[0];
+            Assert.AreSame(failureMechanism, commentContext.CommentContainer);
+
+            mocksRepository.VerifyAll();
+        }
+
+        [Test]
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs
===================================================================
diff -u -r3b29807e8903b2cea3ee7a00a59b2b50f9de1f12 -r3df200a3968f49aa1098764c284a7fafb2a14de4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs	(.../FailureMechanismPlaceholderTreeNodeInfoTest.cs)	(revision 3b29807e8903b2cea3ee7a00a59b2b50f9de1f12)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs	(.../FailureMechanismPlaceholderTreeNodeInfoTest.cs)	(revision 3df200a3968f49aa1098764c284a7fafb2a14de4)
@@ -145,7 +145,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnFoldersWithInputAndOutput()
+        public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnFoldersWithInputAndOutput()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -196,6 +196,39 @@
         }
 
         [Test]
+        public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismComments()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            using (var plugin = new RingtoetsGuiPlugin())
+            {
+                var info = GetInfo(plugin);
+
+                var failureMechanism = new FailureMechanismPlaceholder("test")
+                {
+                    IsRelevant = false
+                };
+                failureMechanism.AddSection(new FailureMechanismSection("A", new[]
+                {
+                    new Point2D(1, 2),
+                    new Point2D(5, 6)
+                }));
+                var failureMechanismContext = new FailureMechanismPlaceholderContext(failureMechanism, assessmentSection);
+
+                // Call
+                object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray();
+
+                // Assert
+                Assert.AreEqual(1, children.Length);
+                var commentContext = (CommentContext<ICommentable>)children[0];
+                Assert.AreSame(failureMechanism, commentContext.CommentContainer);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6dbb29ed12c28b66db763ff603f3ab8e28a0adf4 -r3df200a3968f49aa1098764c284a7fafb2a14de4
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6dbb29ed12c28b66db763ff603f3ab8e28a0adf4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 3df200a3968f49aa1098764c284a7fafb2a14de4)
@@ -119,7 +119,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnChildDataNodes()
+        public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -177,6 +177,34 @@
         }
 
         [Test]
+        public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismComments()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var pipingFailureMechanism = new PipingFailureMechanism
+            {
+                IsRelevant = false
+            };
+            var generalInputParameters = new GeneralPipingInput();
+            var semiProbabilisticInputParameters = new NormProbabilityPipingInput();
+            pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters));
+            pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters));
+
+            var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection);
+
+            // Call
+            var children = info.ChildNodeObjects(pipingFailureMechanismContext).ToArray();
+
+            // Assert
+            Assert.AreEqual(1, children.Length);
+            var commentContext = (CommentContext<ICommentable>)children[0];
+            Assert.AreSame(pipingFailureMechanism, commentContext.CommentContainer);
+            mocks.VerifyAll();
+        }
+
+        [Test]
         [TestCase(false)]
         [TestCase(true)]
         public void GivenMultiplePipingCalculationsWithOutput_WhenClearingOutputFromContextMenu_ThenPipingOutputCleared(bool confirm)