Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -648,7 +648,6 @@
 
                 StructuresClosureCalculationInput actualInput = calculationInputs[0];
                 Assert.AreEqual(usePreprocessor, actualInput.PreprocessorSetting.RunPreprocessor);
-                Assert.IsFalse(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -205,7 +205,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Calculate_ValidDesignWaterLevelCalculationWithPreprocessorDirectory_StartsCalculationWithRightParametersAndLogs(bool usePreprocessor)
+        public void Calculate_ValidDesignWaterLevelCalculationWithPreprocessorDirectory_StartsCalculationWithRightParameters(bool usePreprocessor)
         {
             // Setup
             string preprocessorDirectory = usePreprocessor
@@ -241,7 +241,6 @@
 
                 // Assert
                 Assert.AreEqual(usePreprocessor, calculator.ReceivedInputs.Single().PreprocessorSetting.RunPreprocessor);
-                Assert.IsFalse(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -206,7 +206,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void Calculate_ValidDesignWaterLevelCalculationWithPreprocessorDirectory_StartsCalculationWithRightParametersAndLogs(bool usePreprocessor)
+        public void Calculate_ValidWaveHeightCalculationWithPreprocessorDirectory_StartsCalculationWithRightParameters(bool usePreprocessor)
         {
             // Setup
             string preprocessorDirectory = usePreprocessor
@@ -242,7 +242,6 @@
 
                 // Assert
                 Assert.AreEqual(usePreprocessor, calculator.ReceivedInputs.Single().PreprocessorSetting.RunPreprocessor);
-                Assert.IsFalse(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -192,7 +192,6 @@
                 DunesBoundaryConditionsCalculationInput actualInput = calculator.ReceivedInputs.Single();
                 AssertInput(expectedInput, actualInput);
                 Assert.AreEqual(usePreprocessor, actualInput.PreprocessorSetting.RunPreprocessor);
-                Assert.IsFalse(calculator.IsCanceled);
             }
 
             mockRepository.VerifyAll();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -616,7 +616,6 @@
 
                 StructuresOvertoppingCalculationInput actualInput = calculationInputs[0];
                 Assert.AreEqual(usePreprocessor, actualInput.PreprocessorSetting.RunPreprocessor);
-                Assert.IsFalse(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs	(.../StabilityPointStructuresCalculationService.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs	(.../StabilityPointStructuresCalculationService.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -98,7 +98,7 @@
             return input;
         }
 
-        private StructuresStabilityPointLowSillLinearCalculationInput CreateLowSillLinearCalculationInput(
+        private static StructuresStabilityPointLowSillLinearCalculationInput CreateLowSillLinearCalculationInput(
             StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
@@ -170,7 +170,7 @@
             return structuresStabilityPointLowSillLinearCalculationInput;
         }
 
-        private StructuresStabilityPointLowSillQuadraticCalculationInput CreateLowSillQuadraticCalculationInput(
+        private static StructuresStabilityPointLowSillQuadraticCalculationInput CreateLowSillQuadraticCalculationInput(
             StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
@@ -240,7 +240,7 @@
                 structureInput.WidthFlowApertures.StandardDeviation);
         }
 
-        private StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput(
+        private static StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput(
             StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
@@ -310,7 +310,7 @@
                 structureInput.StabilityLinearLoadModel.CoefficientOfVariation);
         }
 
-        private StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput(
+        private static StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput(
             StabilityPointStructuresInput structureInput,
             GeneralStabilityPointStructuresInput generalInput)
         {
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r997a7c7aec4c8fc0466687fe09b09463c4628a6b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs	(.../StabilityPointStructuresCalculationServiceTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs	(.../StabilityPointStructuresCalculationServiceTest.cs)	(revision 997a7c7aec4c8fc0466687fe09b09463c4628a6b)
@@ -1149,7 +1149,6 @@
 
                 StructuresStabilityPointCalculationInput actualInput = calculationInputs[0];
                 Assert.AreEqual(usePreprocessor, actualInput.PreprocessorSetting.RunPreprocessor);
-                Assert.IsFalse(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }