Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -28,7 +28,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -56,7 +55,7 @@
                 var info = GetInfo(plugin);
 
                 // Assert
-                Assert.AreEqual(typeof(CommentContext), info.TagType);
+                Assert.AreEqual(typeof(Comment), info.TagType);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
@@ -85,10 +84,8 @@
             {
                 var info = GetInfo(plugin);
 
-                var context = new CommentContext(comment);
-
                 // Call
-                var text = info.Text(context);
+                var text = info.Text(comment);
 
                 // Assert
                 Assert.AreEqual("Opmerkingen", text);
@@ -104,10 +101,9 @@
             using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
-                var context = new CommentContext(comment);
 
                 // Call
-                var image = info.Image(context);
+                var image = info.Image(comment);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.EditDocumentIcon, image);
@@ -146,7 +142,7 @@
 
         private TreeNodeInfo GetInfo(PluginBase gui)
         {
-            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext));
+            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(Comment));
         }
     }
 }
\ No newline at end of file