Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -r885bf1206f17340edb2af79ea7b772663ee4e6c0 -rc1a1e86ae637d4d6ff91fc78b2fb4ab97972d4a5
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs	(.../PipingSurfaceLineUpdateDataStrategyTest.cs)	(revision 885bf1206f17340edb2af79ea7b772663ee4e6c0)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs	(.../PipingSurfaceLineUpdateDataStrategyTest.cs)	(revision c1a1e86ae637d4d6ff91fc78b2fb4ab97972d4a5)
@@ -445,13 +445,12 @@
         {
             // Setup
             PipingSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations();
-            var calculation = new TestPipingCalculation
+            var calculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = surfaceLine
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var failureMechanism = new PipingFailureMechanism();
@@ -492,13 +491,12 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation
+            var affectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = affectedSurfaceLine
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var unaffectedGeometry = new[]
@@ -508,13 +506,12 @@
             };
             var unaffectedSurfaceLine = new PipingSurfaceLine(unaffectedSurfaceLineName);
             unaffectedSurfaceLine.SetGeometry(unaffectedGeometry);
-            var unAffectedCalculation = new TestPipingCalculation
+            var unAffectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = unaffectedSurfaceLine
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var failureMechanism = new PipingFailureMechanism();
@@ -574,13 +571,12 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation
+            var affectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = removedSurfaceLine
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var unaffectedGeometry = new[]
@@ -590,13 +586,12 @@
             };
             var unaffectedSurfaceLine = new PipingSurfaceLine(unaffectedSurfaceLineName);
             unaffectedSurfaceLine.SetGeometry(unaffectedGeometry);
-            var unAffectedCalculation = new TestPipingCalculation
+            var unAffectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = unaffectedSurfaceLine
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var failureMechanism = new PipingFailureMechanism();
@@ -997,13 +992,12 @@
                 new Point3D(1, 2, 3),
                 new Point3D(4, 5, 6)
             });
-            var affectedCalculation = new TestPipingCalculation
+            var affectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = affectedSurfaceLine
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var failureMechanism = new PipingFailureMechanism();
@@ -1050,14 +1044,13 @@
                 new Point3D(4, 0, 2),
                 new Point3D(5, 0, 3)
             });
-            var affectedCalculation = new TestPipingCalculation
+            var affectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = affectedSurfaceLine,
                     EntryPointL = (RoundedDouble) 2
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var failureMechanism = new PipingFailureMechanism();
@@ -1115,15 +1108,14 @@
                 new Point3D(4, 0, 2),
                 new Point3D(5, 0, 3)
             });
-            var affectedCalculation = new TestPipingCalculation
+            var affectedCalculation = new TestPipingCalculation(true)
             {
                 InputParameters =
                 {
                     SurfaceLine = affectedSurfaceLine,
                     EntryPointL = (RoundedDouble) 0,
                     ExitPointL = (RoundedDouble) 3
-                },
-                Output = PipingOutputTestFactory.Create()
+                }
             };
 
             var failureMechanism = new PipingFailureMechanism();