Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r4c21758818f3c1f159de75fec5a3721fe5b50b6a -rc7c07db38829afdc5965c331844e1d39123944ff
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 4c21758818f3c1f159de75fec5a3721fe5b50b6a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision c7c07db38829afdc5965c331844e1d39123944ff)
@@ -339,7 +339,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var viewDataCalculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
             var failureMechanism = new PipingFailureMechanism();
 
             var deletedCalculationContext = new PipingCalculationContext(viewDataCalculation,
@@ -370,8 +370,8 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
-            var viewDataCalculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
 
             var failureMechanism = new PipingFailureMechanism();
 
@@ -403,7 +403,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var viewDataCalculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
             var deletedGroup = new PipingCalculationGroup
             {
                 Children =
@@ -440,9 +440,9 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var viewDataCalculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            var viewDataCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
 
-            var deletedCalculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            var deletedCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
             var deletedGroup = new PipingCalculationGroup
             {
                 Children =