Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -56,7 +56,7 @@
                 var info = GetInfo(plugin);
 
                 // Assert
-                Assert.AreEqual(typeof(CommentContext<ICommentable>), info.TagType);
+                Assert.AreEqual(typeof(CommentContext), info.TagType);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
@@ -79,44 +79,38 @@
         public void Text_Always_ReturnsName()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
-            mocks.ReplayAll();
+            var comment = new Commentable();
 
             using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
-                var context = new CommentContext<ICommentable>(commentMock);
+                var context = new CommentContext(comment);
 
                 // Call
                 var text = info.Text(context);
 
                 // Assert
                 Assert.AreEqual("Opmerkingen", text);
-
-                mocks.VerifyAll();
             }
         }
 
         [Test]
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
-            mocks.ReplayAll();
+            var comment = new Commentable();
 
             using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
-                var context = new CommentContext<ICommentable>(commentMock);
+                var context = new CommentContext(comment);
 
                 // Call
                 var image = info.Image(context);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.EditDocumentIcon, image);
-
-                mocks.VerifyAll();
             }
         }
 
@@ -152,7 +146,7 @@
 
         private TreeNodeInfo GetInfo(PluginBase gui)
         {
-            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext<ICommentable>));
+            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext));
         }
     }
 }
\ No newline at end of file