Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs
===================================================================
diff -u -r6df492af2166d167f1a154b7997c85a4118b1759 -ra99031f9234199d86b6091dc5a8543a2f6d1eb3a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision 6df492af2166d167f1a154b7997c85a4118b1759)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision a99031f9234199d86b6091dc5a8543a2f6d1eb3a)
@@ -75,10 +75,10 @@
             };
 
             // Call
-            bool calculationHasOutput = calculation.HasOutput;
+            bool hasOutput = calculation.HasOutput;
 
             // Assert
-            Assert.IsFalse(calculationHasOutput);
+            Assert.IsFalse(hasOutput);
         }
 
         [Test]
@@ -91,13 +91,45 @@
             };
 
             // Call
-            bool calculationHasOutput = calculation.HasOutput;
+            bool hasOutput = calculation.HasOutput;
 
             // Assert
-            Assert.IsTrue(calculationHasOutput);
+            Assert.IsTrue(hasOutput);
         }
 
         [Test]
+        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new MacroStabilityInwardsCalculation
+            {
+                Output = null
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsTrue(shouldCalculate);
+        }
+
+        [Test]
+        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new MacroStabilityInwardsCalculation
+            {
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsFalse(shouldCalculate);
+        }
+
+        [Test]
         public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -r6df492af2166d167f1a154b7997c85a4118b1759 -ra99031f9234199d86b6091dc5a8543a2f6d1eb3a
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision 6df492af2166d167f1a154b7997c85a4118b1759)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision a99031f9234199d86b6091dc5a8543a2f6d1eb3a)
@@ -89,10 +89,10 @@
             };
 
             // Call
-            bool calculationHasOutput = calculation.HasOutput;
+            bool hasOutput = calculation.HasOutput;
 
             // Assert
-            Assert.IsFalse(calculationHasOutput);
+            Assert.IsFalse(hasOutput);
         }
 
         [Test]
@@ -105,13 +105,45 @@
             };
 
             // Call
-            bool calculationHasOutput = calculation.HasOutput;
+            bool hasOutput = calculation.HasOutput;
 
             // Assert
-            Assert.IsTrue(calculationHasOutput);
+            Assert.IsTrue(hasOutput);
         }
 
         [Test]
+        public void ShouldCalculate_OutputNull_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new PipingCalculation(new GeneralPipingInput())
+            {
+                Output = null
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsTrue(shouldCalculate);
+        }
+
+        [Test]
+        public void ShouldCalculate_OutputSet_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new PipingCalculation(new GeneralPipingInput())
+            {
+                Output = PipingOutputTestFactory.Create()
+            };
+
+            // Call
+            bool shouldCalculate = calculation.ShouldCalculate;
+
+            // Assert
+            Assert.IsFalse(shouldCalculate);
+        }
+
+        [Test]
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup