Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculation.cs
===================================================================
diff -u -re7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc -r3ac3587971bba23281bb2d33418062e655b0f8bf
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculation.cs	(.../PipingCalculation.cs)	(revision e7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculation.cs	(.../PipingCalculation.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
@@ -61,7 +61,7 @@
 
         public string Name { get; set; }
 
-        public abstract bool ShouldCalculate { get; }
+        public bool ShouldCalculate => !HasOutput;
 
         public abstract bool HasOutput { get; }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingCalculation.cs
===================================================================
diff -u -re7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc -r3ac3587971bba23281bb2d33418062e655b0f8bf
--- Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingCalculation.cs	(.../ProbabilisticPipingCalculation.cs)	(revision e7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingCalculation.cs	(.../ProbabilisticPipingCalculation.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
@@ -37,8 +37,6 @@
         /// is <c>null</c>.</exception>
         public ProbabilisticPipingCalculation(GeneralPipingInput generalInputParameters) : base(new ProbabilisticPipingInput(generalInputParameters)) {}
 
-        public override bool ShouldCalculate => !HasOutput;
-
         public override bool HasOutput => Output != null;
 
         /// <summary>
Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingCalculation.cs
===================================================================
diff -u -re7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc -r3ac3587971bba23281bb2d33418062e655b0f8bf
--- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingCalculation.cs	(.../SemiProbabilisticPipingCalculation.cs)	(revision e7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingCalculation.cs	(.../SemiProbabilisticPipingCalculation.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
@@ -37,8 +37,6 @@
         /// is <c>null</c>.</exception>
         public SemiProbabilisticPipingCalculation(GeneralPipingInput generalInputParameters) : base(new SemiProbabilisticPipingInput(generalInputParameters)) {}
 
-        public override bool ShouldCalculate => !HasOutput;
-
         public override bool HasOutput => Output != null;
 
         /// <summary>
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -re7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc -r3ac3587971bba23281bb2d33418062e655b0f8bf
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision e7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
@@ -59,6 +59,38 @@
         }
 
         [Test]
+        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput())
+            {
+                Output = null
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsTrue(shouldCalculate);
+        }
+
+        [Test]
+        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput())
+            {
+                Output = new ProbabilisticPipingOutput()
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsFalse(shouldCalculate);
+        }
+
+        [Test]
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -re7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc -r3ac3587971bba23281bb2d33418062e655b0f8bf
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision e7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
@@ -87,37 +87,5 @@
             // Assert
             Assert.IsTrue(hasOutput);
         }
-
-        [Test]
-        public void ShouldCalculate_OutputNull_ReturnsTrue()
-        {
-            // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput())
-            {
-                Output = null
-            };
-
-            // Call
-            bool shouldCalculate = calculation.ShouldCalculate;
-
-            // Assert
-            Assert.IsTrue(shouldCalculate);
-        }
-
-        [Test]
-        public void ShouldCalculate_OutputSet_ReturnsFalse()
-        {
-            // Setup
-            var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput())
-            {
-                Output = new ProbabilisticPipingOutput()
-            };
-
-            // Call
-            bool shouldCalculate = calculation.ShouldCalculate;
-
-            // Assert
-            Assert.IsFalse(shouldCalculate);
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -re7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc -r3ac3587971bba23281bb2d33418062e655b0f8bf
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs	(.../SemiProbabilisticPipingCalculationTest.cs)	(revision e7176fd7ca6a9b13f0d34aa0d792e06b7bc07bbc)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs	(.../SemiProbabilisticPipingCalculationTest.cs)	(revision 3ac3587971bba23281bb2d33418062e655b0f8bf)
@@ -88,37 +88,5 @@
             // Assert
             Assert.IsTrue(hasOutput);
         }
-
-        [Test]
-        public void ShouldCalculate_OutputNull_ReturnsTrue()
-        {
-            // Setup
-            var calculation = new SemiProbabilisticPipingCalculation(new GeneralPipingInput())
-            {
-                Output = null
-            };
-
-            // Call
-            bool shouldCalculate = calculation.ShouldCalculate;
-
-            // Assert
-            Assert.IsTrue(shouldCalculate);
-        }
-
-        [Test]
-        public void ShouldCalculate_OutputSet_ReturnsFalse()
-        {
-            // Setup
-            var calculation = new SemiProbabilisticPipingCalculation(new GeneralPipingInput())
-            {
-                Output = PipingOutputTestFactory.Create()
-            };
-
-            // Call
-            bool shouldCalculate = calculation.ShouldCalculate;
-
-            // Assert
-            Assert.IsFalse(shouldCalculate);
-        }
     }
 }
\ No newline at end of file