Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs
===================================================================
diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -re73a7b80f2efd13d7d7e83844b778e6edf798d3d
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs)	(revision 07f3d67fe9512b3c8303ff09398b0a234900d546)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs)	(revision e73a7b80f2efd13d7d7e83844b778e6edf798d3d)
@@ -45,7 +45,6 @@
 
             Assert.AreEqual(RingtoetsCommonDataResources.Calculation_DefaultName, calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
-            Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments.Body);
             Assert.IsNull(calculation.Output);
             Assert.IsNull(calculation.InputParameters.ForeshoreProfile);
@@ -103,6 +102,38 @@
         }
 
         [Test]
+        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
+            {
+                Output = null
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsTrue(shouldCalculate);
+        }
+
+        [Test]
+        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
+            {
+                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>())
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsFalse(shouldCalculate);
+        }
+
+        [Test]
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs
===================================================================
diff -u -ra99031f9234199d86b6091dc5a8543a2f6d1eb3a -re73a7b80f2efd13d7d7e83844b778e6edf798d3d
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision a99031f9234199d86b6091dc5a8543a2f6d1eb3a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision e73a7b80f2efd13d7d7e83844b778e6edf798d3d)
@@ -44,7 +44,6 @@
 
             Assert.IsInstanceOf<MacroStabilityInwardsInput>(calculation.InputParameters);
 
-            Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments.Body);
             Assert.IsNull(calculation.Output);
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -ra99031f9234199d86b6091dc5a8543a2f6d1eb3a -re73a7b80f2efd13d7d7e83844b778e6edf798d3d
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision a99031f9234199d86b6091dc5a8543a2f6d1eb3a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision e73a7b80f2efd13d7d7e83844b778e6edf798d3d)
@@ -48,7 +48,6 @@
 
             Assert.IsInstanceOf<PipingInput>(calculation.InputParameters);
 
-            Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments.Body);
             Assert.IsNull(calculation.Output);
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -re73a7b80f2efd13d7d7e83844b778e6edf798d3d
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision 07f3d67fe9512b3c8303ff09398b0a234900d546)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision e73a7b80f2efd13d7d7e83844b778e6edf798d3d)
@@ -44,7 +44,6 @@
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
-            Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments.Body);
             Assert.IsNull(calculation.Output);
             Assert.IsNull(calculation.InputParameters.ForeshoreProfile);
@@ -102,6 +101,38 @@
         }
 
         [Test]
+        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new StabilityStoneCoverWaveConditionsCalculation
+            {
+                Output = null
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsTrue(shouldCalculate);
+        }
+
+        [Test]
+        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new StabilityStoneCoverWaveConditionsCalculation
+            {
+                Output = new StabilityStoneCoverWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), Enumerable.Empty<WaveConditionsOutput>())
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsFalse(shouldCalculate);
+        }
+
+        [Test]
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -re73a7b80f2efd13d7d7e83844b778e6edf798d3d
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs)	(revision 07f3d67fe9512b3c8303ff09398b0a234900d546)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs)	(revision e73a7b80f2efd13d7d7e83844b778e6edf798d3d)
@@ -44,7 +44,6 @@
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
-            Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments.Body);
             Assert.IsNull(calculation.Output);
             Assert.IsNull(calculation.InputParameters.ForeshoreProfile);
@@ -102,6 +101,38 @@
         }
 
         [Test]
+        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
+            {
+                Output = null
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsTrue(shouldCalculate);
+        }
+
+        [Test]
+        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
+            {
+                Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>())
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsFalse(shouldCalculate);
+        }
+
+        [Test]
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup