Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -r255ffcdbfd4ffff68c336ad9922e6196636c2803
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 23a37b025a5d0358c1f30fb31de41a2c284519a5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 255ffcdbfd4ffff68c336ad9922e6196636c2803)
@@ -30,9 +30,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.Views;
-using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin.Test.ViewInfos
@@ -337,17 +334,12 @@
         public void CloseForData_ViewCorrespondingToRemovedCalculationItem_ReturnsTrue()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
+            var viewDataCalculation = mocks.Stub<ICalculation>();
+            var deletedCalculationContext = mocks.StrictMock<ICalculationContext<ICalculationBase, IFailureMechanism>>();
 
-            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
-            var failureMechanism = new PipingFailureMechanism();
+            deletedCalculationContext.Expect(c => c.WrappedData).Return(viewDataCalculation);
 
-            var deletedCalculationContext = new PipingCalculationScenarioContext(viewDataCalculation,
-                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                         Enumerable.Empty<StochasticSoilModel>(),
-                                                                         failureMechanism,
-                                                                         assessmentSectionMock);
+            mocks.ReplayAll();
 
             using (var view = new CommentView
             {
@@ -368,20 +360,14 @@
         public void CloseForData_ViewNotCorrespondingToRemovedCalculationItem_ReturnsFalse()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
+            var calculation = mocks.Stub<ICalculation>();
+            var viewDataCalculation = mocks.Stub<ICalculation>();
+            var deletedCalculationContext = mocks.StrictMock<ICalculationContext<ICalculationBase, IFailureMechanism>>();
 
-            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
-            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            deletedCalculationContext.Expect(c => c.WrappedData).Return(calculation);
 
-            var failureMechanism = new PipingFailureMechanism();
+            mocks.ReplayAll();
 
-            var deletedCalculationContext = new PipingCalculationScenarioContext(calculation,
-                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                         Enumerable.Empty<StochasticSoilModel>(),
-                                                                         failureMechanism,
-                                                                         assessmentSectionMock);
-
             using (var view = new CommentView
             {
                 Data = viewDataCalculation
@@ -393,31 +379,28 @@
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
         [Test]
         public void CloseForData_ViewDataIsCalculationOfRemovedCalculationGroup_ReturnsTrue()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new PipingFailureMechanism();
-            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var viewDataCalculation = mocks.Stub<ICalculation>();
+            var deletedGroupContext = mocks.StrictMock<ICalculationContext<CalculationGroup, IFailureMechanism>>();
             var deletedGroup = new CalculationGroup
             {
                 Children =
                 {
                     viewDataCalculation
                 }
             };
-            var deletedGroupContext = new PipingCalculationGroupContext(deletedGroup,
-                                                                        Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<StochasticSoilModel>(),
-                                                                        failureMechanism,
-                                                                        assessmentSectionMock);
 
+            deletedGroupContext.Expect(g => g.WrappedData).Return(deletedGroup);
+
+            mocks.ReplayAll();
+
             using (var view = new CommentView
             {
                 Data = viewDataCalculation
@@ -437,26 +420,21 @@
         public void CloseForData_ViewDataIsCalculationButNotOfRemovedCalculationGroup_ReturnsFalse()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new PipingFailureMechanism();
-            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
-
-            var deletedCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput());
+            var viewDataCalculation = mocks.Stub<ICalculation>();
+            var deletedCalculation = mocks.Stub<ICalculation>();
+            var deletedGroupContext = mocks.StrictMock<ICalculationContext<CalculationGroup, IFailureMechanism>>();
             var deletedGroup = new CalculationGroup
             {
                 Children =
                 {
                     deletedCalculation
                 }
             };
-            var deletedGroupContext = new PipingCalculationGroupContext(deletedGroup,
-                                                                        Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<StochasticSoilModel>(),
-                                                                        failureMechanism,
-                                                                        assessmentSectionMock);
 
+            deletedGroupContext.Expect(g => g.WrappedData).Return(deletedGroup);
+
+            mocks.ReplayAll();
+
             using (var view = new CommentView
             {
                 Data = viewDataCalculation