Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
@@ -611,7 +611,7 @@
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository);
 
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
                              .Return(new TestStructuresOvertoppingCalculator());
             mockRepository.ReplayAll();
@@ -683,7 +683,7 @@
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository);
 
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
                              .Return(new TestStructuresOvertoppingCalculator());
             mockRepository.ReplayAll();
@@ -733,10 +733,10 @@
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository);
 
-            var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator();
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculator = new TestStructuresOvertoppingCalculator();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
-                             .Return(testStructuresOvertoppingCalculator);
+                             .Return(calculator);
             mockRepository.ReplayAll();
 
             var calculation = new TestHeightStructuresCalculation
@@ -761,7 +761,7 @@
                                                                    validFilePath);
 
                 // Assert
-                StructuresOvertoppingCalculationInput[] overtoppingCalculationInputs = testStructuresOvertoppingCalculator.ReceivedInputs.ToArray();
+                StructuresOvertoppingCalculationInput[] overtoppingCalculationInputs = calculator.ReceivedInputs.ToArray();
                 Assert.AreEqual(1, overtoppingCalculationInputs.Length);
 
                 GeneralHeightStructuresInput generalInput = heightStructuresFailureMechanism.GeneralInput;
@@ -789,7 +789,7 @@
 
                 StructuresOvertoppingCalculationInput actualInput = overtoppingCalculationInputs[0];
                 HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput);
-                Assert.IsFalse(testStructuresOvertoppingCalculator.IsCanceled);
+                Assert.IsFalse(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }
@@ -808,10 +808,10 @@
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository);
 
-            var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator();
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculator = new TestStructuresOvertoppingCalculator();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
-                             .Return(testStructuresOvertoppingCalculator);
+                             .Return(calculator);
             mockRepository.ReplayAll();
 
             var calculation = new TestHeightStructuresCalculation
@@ -825,7 +825,7 @@
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 var service = new HeightStructuresCalculationService();
-                testStructuresOvertoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel();
+                calculator.CalculationFinishedHandler += (s, e) => service.Cancel();
 
                 // Call
                 service.Calculate(calculation,
@@ -835,7 +835,7 @@
 
                 // Assert
                 Assert.IsNull(calculation.Output);
-                Assert.IsTrue(testStructuresOvertoppingCalculator.IsCanceled);
+                Assert.IsTrue(calculator.IsCanceled);
             }
             mockRepository.VerifyAll();
         }
@@ -855,14 +855,14 @@
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
                                                                                                            mockRepository);
 
-            var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator
+            var calculator = new TestStructuresOvertoppingCalculator
             {
                 EndInFailure = true,
                 LastErrorFileContent = "An error occurred"
             };
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
-                             .Return(testStructuresOvertoppingCalculator);
+                             .Return(calculator);
             mockRepository.ReplayAll();
 
             var calculation = new TestHeightStructuresCalculation
@@ -924,13 +924,13 @@
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
                                                                                                            mockRepository);
 
-            var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator
+            var calculator = new TestStructuresOvertoppingCalculator
             {
                 EndInFailure = true
             };
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
-                             .Return(testStructuresOvertoppingCalculator);
+                             .Return(calculator);
             mockRepository.ReplayAll();
 
             var calculation = new TestHeightStructuresCalculation
@@ -992,13 +992,13 @@
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
                                                                                                            mockRepository);
 
-            var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator
+            var calculator = new TestStructuresOvertoppingCalculator
             {
                 LastErrorFileContent = "An error occurred"
             };
-            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath))
-                             .Return(testStructuresOvertoppingCalculator);
+                             .Return(calculator);
             mockRepository.ReplayAll();
 
             var calculation = new TestHeightStructuresCalculation