Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -43,19 +43,35 @@
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var commentMock = mocks.StrictMock<IComment>();
             var viewMock = mocks.StrictMock<CommentView>();
 
             mocks.ReplayAll();
 
             // Call
-            var viewName = info.GetViewName(viewMock, assessmentSectionMock);
+            var viewName = info.GetViewName(viewMock, commentMock);
 
             // Assert
             Assert.AreEqual("Opmerkingen", viewName);
         }
 
         [Test]
+        public void GetViewData_Always_ReturnsIComment()
+        {
+            // Setup
+            var commentMock = mocks.StrictMock<IComment>();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var contextMock = mocks.StrictMock<CommentContext<IComment>>(commentMock, assessmentSectionMock);
+            mocks.ReplayAll();
+
+            // Call
+            var viewData = info.GetViewData(contextMock);
+
+            // Assert
+            Assert.AreSame(commentMock, viewData);
+        }
+
+        [Test]
         public void ViewType_Always_ReturnsViewType()
         {
             // Call
@@ -100,9 +116,11 @@
         {
             // Setup
             var viewMock = mocks.StrictMock<CommentView>();
+            var commentMock = mocks.Stub<IComment>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
-            viewMock.Expect(vm => vm.Data).Return(assessmentSectionMock);
+            viewMock.Expect(vm => vm.Data).Return(commentMock);
+            viewMock.Expect(vm => vm.AssessmentSection).Return(assessmentSectionMock);
 
             mocks.ReplayAll();
 
@@ -118,10 +136,12 @@
         {
             // Setup
             var viewMock = mocks.StrictMock<CommentView>();
+            var commentMock = mocks.Stub<IComment>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var assessmentSectionMock2 = mocks.StrictMock<IAssessmentSection>();
 
-            viewMock.Expect(vm => vm.Data).Return(assessmentSectionMock2);
+            viewMock.Expect(vm => vm.Data).Return(commentMock);
+            viewMock.Expect(vm => vm.AssessmentSection).Return(assessmentSectionMock2);
 
             mocks.ReplayAll();