Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculation.cs
===================================================================
diff -u -ra5c551a343fee7ea3d7e46dd36c82cf180a1b597 -rd2d2142de47452c1faa571a5de3157d6f3205812
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculation.cs	(.../HydraulicBoundaryLocationCalculation.cs)	(revision a5c551a343fee7ea3d7e46dd36c82cf180a1b597)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculation.cs	(.../HydraulicBoundaryLocationCalculation.cs)	(revision d2d2142de47452c1faa571a5de3157d6f3205812)
@@ -54,5 +54,16 @@
                 return Output != null;
             }
         }
+
+        /// <summary>
+        /// Gets a value indicating whether the calculation has already been calculated.
+        /// </summary>
+        /// <returns><c>true</c> if the calculation is fully calculated, <c>false</c> otherwise.</returns>
+        /// <remarks>A calculation is fully calculated, depending on if the illustration points 
+        /// are set to be calculated.</remarks>
+        public bool IsCalculated()
+        {
+            return HasOutput && InputParameters.ShouldIllustrationPointsBeCalculated == Output.HasGeneralResult;
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -ree6a3b6a2c63799f459b0735f660de5703abdc3b -rd2d2142de47452c1faa571a5de3157d6f3205812
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision ee6a3b6a2c63799f459b0735f660de5703abdc3b)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision d2d2142de47452c1faa571a5de3157d6f3205812)
@@ -88,7 +88,7 @@
 
         protected override bool Validate()
         {
-            if (AlreadyCalculated)
+            if (hydraulicBoundaryLocationCalculation.IsCalculated())
             {
                 State = ActivityState.Skipped;
                 return true;
@@ -119,13 +119,5 @@
         {
             hydraulicBoundaryLocation.NotifyObservers();
         }
-
-        private bool AlreadyCalculated
-        {
-            get
-            {
-                return calculationWrapper.IsCalculated();
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationWrapperTest.cs
===================================================================
diff -u -rad204174e592dafca89f81a97f5a42f9f5114baf -rd2d2142de47452c1faa571a5de3157d6f3205812
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationWrapperTest.cs	(.../HydraulicBoundaryCalculationWrapperTest.cs)	(revision ad204174e592dafca89f81a97f5a42f9f5114baf)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationWrapperTest.cs	(.../HydraulicBoundaryCalculationWrapperTest.cs)	(revision d2d2142de47452c1faa571a5de3157d6f3205812)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -31,28 +30,6 @@
     [TestFixture]
     public class HydraulicBoundaryCalculationWrapperTest
     {
-        private static IEnumerable<TestCaseData> HydraulicBoundaryLocationCalculationsToPerform
-        {
-            get
-            {
-                yield return new TestCaseData(new HydraulicBoundaryLocationCalculation
-                {
-                    InputParameters =
-                    {
-                        ShouldIllustrationPointsBeCalculated = true
-                    },
-                    Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged)
-                }, true);
-
-                yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(), true);
-
-                yield return new TestCaseData(new HydraulicBoundaryLocationCalculation
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged)
-                }, false);
-            }
-        }
-
         [Test]
         public void Constructor_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
         {
@@ -101,22 +78,6 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(HydraulicBoundaryLocationCalculationsToPerform))]
-        public void IsCalculated_NotFullyCalculated_ReturnIsCalculated(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
-                                                                       bool shouldBeCalculated)
-        {
-            // Setup
-            var calculationWrapper = new HydraulicBoundaryCalculationWrapper(new TestHydraulicBoundaryLocation(),
-                                                                             hydraulicBoundaryLocationCalculation);
-
-            // Call
-            bool isCalculated = calculationWrapper.IsCalculated();
-
-            // Assert
-            Assert.AreEqual(!shouldBeCalculated, isCalculated);
-        }
-
-        [Test]
         public void Output_ValidOutput_SetsOutputOnCalculation()
         {
             // Setup
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationTest.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rd2d2142de47452c1faa571a5de3157d6f3205812
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationTest.cs	(.../HydraulicBoundaryLocationCalculationTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationTest.cs	(.../HydraulicBoundaryLocationCalculationTest.cs)	(revision d2d2142de47452c1faa571a5de3157d6f3205812)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -57,5 +58,36 @@
             // Assert
             Assert.AreEqual(setOutput, hasOutput);
         }
+
+        [Test]
+        [TestCaseSource(nameof(GetHydraulicBoundaryLocationCalculations))]
+        public void IsCalculated_NotFullyCalculated_ReturnIsCalculated(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
+                                                                       bool expectedIsCalculated)
+        {
+            // Call
+            bool isCalculated = hydraulicBoundaryLocationCalculation.IsCalculated();
+
+            // Assert
+            Assert.AreEqual(expectedIsCalculated, isCalculated);
+        }
+
+        private static IEnumerable<TestCaseData> GetHydraulicBoundaryLocationCalculations()
+        {
+            yield return new TestCaseData(new HydraulicBoundaryLocationCalculation
+            {
+                InputParameters =
+                {
+                    ShouldIllustrationPointsBeCalculated = true
+                },
+                Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged)
+            }, false);
+
+            yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(), false);
+
+            yield return new TestCaseData(new HydraulicBoundaryLocationCalculation
+            {
+                Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged)
+            }, true);
+        }
     }
 }
\ No newline at end of file