Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r7c3056aafbb670d79d239ef3d38e9d942bc33498 -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 7c3056aafbb670d79d239ef3d38e9d942bc33498)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
@@ -59,39 +59,39 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(CommentContext<ICommentable>), info.DataType);
+            Assert.AreEqual(typeof(CommentContext), info.DataType);
         }
 
         [Test]
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
+            var comment = new Commentable();
             var viewMock = mocks.StrictMock<CommentView>();
 
             mocks.ReplayAll();
 
             // Call
-            var viewName = info.GetViewName(viewMock, commentMock);
+            var viewName = info.GetViewName(viewMock, comment);
 
             // Assert
             Assert.AreEqual("Opmerkingen", viewName);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GetViewData_Always_ReturnsIComment()
+        public void GetViewData_Always_ReturnsComment()
         {
             // Setup
-            var commentMock = mocks.StrictMock<ICommentable>();
-            var contextMock = mocks.StrictMock<CommentContext<ICommentable>>(commentMock);
+            var comment = new Commentable();
+            var contextMock = mocks.StrictMock<CommentContext>(comment);
             mocks.ReplayAll();
 
             // Call
             var viewData = info.GetViewData(contextMock);
 
             // Assert
-            Assert.AreSame(commentMock, viewData);
+            Assert.AreSame(comment, viewData);
             mocks.VerifyAll();
         }
 
@@ -112,7 +112,7 @@
             var dataType = info.DataType;
 
             // Assert
-            Assert.AreEqual(typeof(CommentContext<ICommentable>), dataType);
+            Assert.AreEqual(typeof(CommentContext), dataType);
         }
 
         [Test]
@@ -122,11 +122,11 @@
             var viewDataType = info.ViewDataType;
 
             // Assert
-            Assert.AreEqual(typeof(ICommentable), viewDataType);
+            Assert.AreEqual(typeof(Commentable), viewDataType);
         }
 
         [Test]
-        public void Image_Always_ReturnsGenericInputOutputIcon()
+        public void Image_Always_ReturnsEditDocumentIcon()
         {
             // Call
             var image = info.Image;
@@ -139,12 +139,12 @@
         public void CloseForData_ObjectIsNotObjectOfInterest_ReturnFalse()
         {
             // Setup
-            var commentableMock = mocks.Stub<ICommentable>();
+            var comment = new Commentable();
             mocks.ReplayAll();
 
             using (var view = new CommentView
             {
-                Data = commentableMock
+                Data = comment
             })
             {
                 // Call