Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -183,17 +183,15 @@
                 Assert.AreSame(failureMechanism, failureMechanismSectionsContext.WrappedData);
                 Assert.AreSame(assessmentSection, failureMechanismSectionsContext.ParentAssessmentSection);
 
-                var inputCommentContext = (CommentContext) inputFolder.Contents[1];
-                Assert.IsNotNull(inputCommentContext);
-                Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+                var inputComment = (Comment) inputFolder.Contents[1];
+                Assert.AreSame(failureMechanism.InputComments, inputComment);
 
                 var outputFolder = (CategoryTreeFolder) children[1];
                 Assert.AreEqual("Oordeel", outputFolder.Name);
                 Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-                var outputCommentContext = (CommentContext) outputFolder.Contents[0];
-                Assert.IsNotNull(outputCommentContext);
-                Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+                var outputComment = (Comment) outputFolder.Contents[0];
+                Assert.AreSame(failureMechanism.OutputComments, outputComment);
             }
             mocks.VerifyAll();
         }
@@ -259,8 +257,8 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext) children[0];
-                Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+                var comment = (Comment) children[0];
+                Assert.AreSame(failureMechanism.NotRelevantComments, comment);
             }
             mocks.VerifyAll();
         }