Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -r091761507d94a388b18fefebd38a5d106b9b89c4 -rfa424689d48793c024e73bfcee1c202559eea3e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision 091761507d94a388b18fefebd38a5d106b9b89c4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision fa424689d48793c024e73bfcee1c202559eea3e0)
@@ -27,7 +27,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -54,7 +53,7 @@
                 var info = GetInfo(plugin);
 
             // Assert
-            Assert.AreEqual(typeof(CommentContext<IComment>), info.TagType);
+            Assert.AreEqual(typeof(CommentContext<ICommentable>), info.TagType);
             Assert.IsNull(info.EnsureVisibleOnCreate);
             Assert.IsNull(info.ChildNodeObjects);
             Assert.IsNull(info.CanRename);
@@ -76,16 +75,14 @@
         public void Text_Always_ReturnsName()
         {
             // Setup
-            var commentMock = mocks.StrictMock<IComment>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-
+            var commentMock = mocks.StrictMock<ICommentable>();
             mocks.ReplayAll();
 
             using (var plugin = new RingtoetsGuiPlugin())
             {
                 var info = GetInfo(plugin);
 
-                var context = new CommentContext<IComment>(commentMock, assessmentSectionMock);
+                var context = new CommentContext<ICommentable>(commentMock);
 
                 // Call
                 var text = info.Text(context);
@@ -101,14 +98,13 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var commentMock = mocks.StrictMock<IComment>();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var commentMock = mocks.StrictMock<ICommentable>();
             mocks.ReplayAll();
 
             using (var plugin = new RingtoetsGuiPlugin())
             {
                 var info = GetInfo(plugin);
-                var context = new CommentContext<IComment>(commentMock, assessmentSectionMock);
+                var context = new CommentContext<ICommentable>(commentMock);
 
                 // Call
                 var image = info.Image(context);
@@ -152,7 +148,7 @@
 
         private TreeNodeInfo GetInfo(Core.Common.Gui.Plugin.GuiPlugin gui)
         {
-            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext<IComment>));
+            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext<ICommentable>));
         }
     }
 }