Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -r3ac3587971bba23281bb2d33418062e655b0f8bf -re1228b228633bd834e448a5c5e48eccd29852287
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision e1228b228633bd834e448a5c5e48eccd29852287)
@@ -59,13 +59,10 @@
         }
 
         [Test]
-        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        public void ShouldCalculate_HasOutputFalse_ReturnsTrue()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput())
-            {
-                Output = null
-            };
+            var calculation = new TestPipingCalculation();
 
             // Call
             bool shouldCalculate = calculation.ShouldCalculate;
@@ -75,13 +72,10 @@
         }
 
         [Test]
-        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        public void ShouldCalculate_HasOutputTrue_ReturnsFalse()
         {
             // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput())
-            {
-                Output = new ProbabilisticPipingOutput()
-            };
+            var calculation = new TestPipingCalculation(true);
 
             // Call
             bool shouldCalculate = calculation.ShouldCalculate;
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculation.cs
===================================================================
diff -u -r983089fb9999d4b3436d305b58af87dffb6b961f -re1228b228633bd834e448a5c5e48eccd29852287
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculation.cs	(.../TestPipingCalculation.cs)	(revision 983089fb9999d4b3436d305b58af87dffb6b961f)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculation.cs	(.../TestPipingCalculation.cs)	(revision e1228b228633bd834e448a5c5e48eccd29852287)
@@ -31,14 +31,26 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestPipingCalculation"/> with default <see cref="PipingInput"/>.
         /// </summary>
-        public TestPipingCalculation() : base(new TestPipingInput()) {}
+        /// <param name="hasOutput">Whether or not the calculation should have output.</param>
+        public TestPipingCalculation(bool hasOutput = false) : this(new TestPipingInput(), hasOutput) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="TestPipingCalculation"/>.
         /// </summary>
         /// <param name="pipingInput">The input parameters to perform the piping calculation with.</param>
+        /// <param name="hasOutput">Whether or not the calculation should have output.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="pipingInput"/>
         /// is <c>null</c>.</exception>
-        public TestPipingCalculation(PipingInput pipingInput) : base(pipingInput) {}
+        public TestPipingCalculation(PipingInput pipingInput, bool hasOutput = false) : base(pipingInput)
+        {
+            HasOutput = hasOutput;
+        }
+
+        public override bool HasOutput { get; }
+
+        public override void ClearOutput()
+        {
+            // Do nothing
+        }
     }
 }
\ No newline at end of file