Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -re5d6f3ed4676acd3b98ac309a0e015335840916e -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision e5d6f3ed4676acd3b98ac309a0e015335840916e)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -40,6 +40,7 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Service.Test
 {
@@ -80,12 +81,16 @@
         public void Validate_NoHydraulicBoundaryDatabase_LogValidationMessageAndReturnFalse()
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             string testFilePath = Path.Combine(testDataPath, "NonExisting.sqlite");
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, testFilePath);
@@ -101,18 +106,23 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
         public void Validate_InvalidHydraulicBoundaryDatabase_LogsValidationMessageAndReturnFalse()
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             string testFilePath = Path.Combine(testDataPath, "corruptschema.sqlite");
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, testFilePath);
@@ -128,18 +138,23 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
         public void Validate_ValidHydraulicBoundaryDatabaseWithoutSettings_LogsValidationMessageAndReturnFalse()
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             string testFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite");
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, testFilePath);
@@ -155,18 +170,23 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
         public void Validate_NoHydraulicBoundaryLocation_LogsValidationMessageAndReturnFalse()
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             calculation.InputParameters.HydraulicBoundaryLocation = null;
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
@@ -182,18 +202,23 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
         public void Validate_NoDesignWaterLevel_LogsValidationMessageAndReturnFalse()
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelOutput = null;
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
@@ -209,6 +234,7 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -217,13 +243,17 @@
         public void Validate_NoWaterLevels_LogsValidationMessageAndReturnFalse(double lowerBoundaryRevetment, double upperBoundaryRevetment)
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             calculation.InputParameters.LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment;
             calculation.InputParameters.UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment;
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
@@ -239,6 +269,7 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -248,14 +279,18 @@
         public void Validate_CalculationWithForeshoreAndUsesBreakWaterAndHasInvalidBreakWaterHeight_LogsValidationMessageAndReturnFalse(double breakWaterHeight)
         {
             // Setup
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            mockRepository.ReplayAll();
+
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
             calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam,
                                                                                                    breakWaterHeight));
             calculation.InputParameters.UseBreakWater = true;
 
             var isValid = true;
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation, validFilePath);
@@ -272,6 +307,7 @@
                 });
                 Assert.IsFalse(isValid);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -343,21 +379,24 @@
         public void Calculate_CalculationWithForeshoreAndDoesNotUseBreakWaterAndHasInvalidBreakWaterHeight_PerformCalculationAndLogStartAndEnd(double breakWaterHeight)
         {
             // Setup
-            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
-            calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam,
-                                                                                                   breakWaterHeight));
-            calculation.InputParameters.UseBreakWater = false;
             var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
                 Contribution = 20
             };
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
                                                                                                                                   mockRepository);
             mockRepository.ReplayAll();
 
-            using (new HydraRingCalculatorFactoryConfig())
+            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation();
+            calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam,
+                                                                                                   breakWaterHeight));
+            calculation.InputParameters.UseBreakWater = false;
+
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
@@ -386,6 +425,7 @@
                     StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[7]);
                 });
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -402,6 +442,8 @@
             };
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
                                                                                                                                   mockRepository);
             mockRepository.ReplayAll();
@@ -421,7 +463,7 @@
                     break;
             }
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 Action call = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
@@ -450,6 +492,7 @@
                     StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[7]);
                 });
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -461,16 +504,17 @@
             {
                 Contribution = 20
             };
+            var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator();
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator).Repeat.Times(3);
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
                                                                                                                                   mockRepository);
             mockRepository.ReplayAll();
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                TestWaveConditionsCosineCalculator testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-
                 // Call
                 new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
                                                                                           grassCoverErosionOutwardsFailureMechanism,
@@ -481,8 +525,6 @@
                 WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray();
                 Assert.AreEqual(3, testWaveConditionsInputs.Length);
 
-                Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory);
-
                 var waterLevelIndex = 0;
                 foreach (WaveConditionsCosineCalculationInput actualInput in testWaveConditionsInputs)
                 {
@@ -508,6 +550,7 @@
                     HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput);
                 }
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -521,11 +564,12 @@
             };
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
                                                                                                                                   mockRepository);
             mockRepository.ReplayAll();
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 var grassCoverErosionOutwardsWaveConditionsCalculationService = new GrassCoverErosionOutwardsWaveConditionsCalculationService();
                 grassCoverErosionOutwardsWaveConditionsCalculationService.Cancel();
@@ -551,15 +595,17 @@
             {
                 Contribution = 20
             };
+            var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator();
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator);
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
                                                                                                                                   mockRepository);
             mockRepository.ReplayAll();
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                TestWaveConditionsCosineCalculator testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
                 var grassCoverErosionOutwardsWaveConditionsCalculationService = new GrassCoverErosionOutwardsWaveConditionsCalculationService();
                 testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => grassCoverErosionOutwardsWaveConditionsCalculationService.Cancel();
 
@@ -587,11 +633,13 @@
             };
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3);
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
                                                                                                                                   mockRepository);
             mockRepository.ReplayAll();
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
                 new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
@@ -603,88 +651,12 @@
                 Assert.IsNotNull(calculation.Output);
                 Assert.AreEqual(3, calculation.Output.Items.Count());
             }
-        }
-
-        [Test]
-        public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException()
-        {
-            // Setup
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
-            {
-                Contribution = 20
-            };
-
-            var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(failureMechanism, mockRepository);
-            mockRepository.ReplayAll();
-
-            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation();
-
-            using (new HydraRingCalculatorFactoryConfig())
-            {
-                TestWaveConditionsCosineCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-                calculator.LastErrorFileContent = "An error occurred";
-                calculator.EndInFailure = true;
-
-                HydraRingCalculationException exception = null;
-
-                // Call
-                Action call = () =>
-                {
-                    try
-                    {
-                        new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
-                                                                                                  failureMechanism,
-                                                                                                  assessmentSectionStub,
-                                                                                                  validFilePath);
-                    }
-                    catch (HydraRingCalculationException e)
-                    {
-                        exception = e;
-                    }
-                };
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(15, msgs.Length);
-
-                    StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]);
-
-                    const string detailedReport = " Bekijk het foutrapport door op details te klikken.";
-                    RoundedDouble[] waterLevels = calculation.InputParameters.WaterLevels.ToArray();
-                    RoundedDouble waterLevelUpperBoundaryRevetment = waterLevels[0];
-                    RoundedDouble waterLevelMiddleRevetment = waterLevels[1];
-                    RoundedDouble waterLevelLowerBoundaryRevetment = waterLevels[2];
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' gestart.", msgs[1]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelUpperBoundaryRevetment}'.{detailedReport}", msgs[2]);
-                    StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' beëindigd.", msgs[4]);
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelMiddleRevetment}' gestart.", msgs[5]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelMiddleRevetment}'.{detailedReport}", msgs[6]);
-                    StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[7]);
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelMiddleRevetment}' beëindigd.", msgs[8]);
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelLowerBoundaryRevetment}' gestart.", msgs[9]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelLowerBoundaryRevetment}'.{detailedReport}", msgs[10]);
-                    StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[11]);
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelLowerBoundaryRevetment}' beëindigd.", msgs[12]);
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor alle waterstanden.", msgs[13]);
-                    StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[14]);
-                });
-                Assert.IsInstanceOf<HydraRingCalculationException>(exception);
-                Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor alle waterstanden.", exception.Message);
-                Assert.IsNull(calculation.Output);
-            }
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException()
+        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
+        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+                                                                                                   string detailedReport)
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
@@ -693,17 +665,16 @@
             };
 
             var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails).Repeat.Times(3);
             IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
                                                                                                            mockRepository);
             mockRepository.ReplayAll();
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation();
 
-            using (new HydraRingCalculatorFactoryConfig())
+            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
-                TestWaveConditionsCosineCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-                calculator.EndInFailure = true;
-
                 HydraRingCalculationException exception = null;
 
                 // Call
@@ -730,24 +701,23 @@
 
                     StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]);
 
-                    const string detailedReport = " Er is geen foutrapport beschikbaar.";
                     RoundedDouble[] waterLevels = calculation.InputParameters.WaterLevels.ToArray();
                     RoundedDouble waterLevelUpperBoundaryRevetment = waterLevels[0];
                     RoundedDouble waterLevelMiddleRevetment = waterLevels[1];
                     RoundedDouble waterLevelLowerBoundaryRevetment = waterLevels[2];
 
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' gestart.", msgs[1]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelUpperBoundaryRevetment}'.{detailedReport}", msgs[2]);
+                    Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelUpperBoundaryRevetment}'. {detailedReport}", msgs[2]);
                     StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' beëindigd.", msgs[4]);
 
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelMiddleRevetment}' gestart.", msgs[5]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelMiddleRevetment}'.{detailedReport}", msgs[6]);
+                    Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelMiddleRevetment}'. {detailedReport}", msgs[6]);
                     StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[7]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelMiddleRevetment}' beëindigd.", msgs[8]);
 
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelLowerBoundaryRevetment}' gestart.", msgs[9]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelLowerBoundaryRevetment}'.{detailedReport}", msgs[10]);
+                    Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelLowerBoundaryRevetment}'. {detailedReport}", msgs[10]);
                     StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[11]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelLowerBoundaryRevetment}' beëindigd.", msgs[12]);
 
@@ -761,117 +731,6 @@
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void Calculate_CalculationFailedWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException()
-        {
-            // Setup
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
-            {
-                Contribution = 20
-            };
-
-            var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
-                                                                                                           mockRepository);
-            mockRepository.ReplayAll();
-
-            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation();
-
-            using (new HydraRingCalculatorFactoryConfig())
-            {
-                TestWaveConditionsCosineCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-                calculator.EndInFailure = false;
-                calculator.LastErrorFileContent = "An error occurred";
-
-                HydraRingCalculationException exception = null;
-
-                // Call
-                Action call = () =>
-                {
-                    try
-                    {
-                        new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
-                                                                                                  failureMechanism,
-                                                                                                  assessmentSectionStub,
-                                                                                                  validFilePath);
-                    }
-                    catch (HydraRingCalculationException e)
-                    {
-                        exception = e;
-                    }
-                };
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(15, msgs.Length);
-
-                    StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]);
-
-                    const string detailedReport = " Bekijk het foutrapport door op details te klikken.";
-                    RoundedDouble[] waterLevels = calculation.InputParameters.WaterLevels.ToArray();
-                    RoundedDouble waterLevelUpperBoundaryRevetment = waterLevels[0];
-                    RoundedDouble waterLevelMiddleRevetment = waterLevels[1];
-                    RoundedDouble waterLevelLowerBoundaryRevetment = waterLevels[2];
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' gestart.", msgs[1]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelUpperBoundaryRevetment}'.{detailedReport}", msgs[2]);
-                    StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' beëindigd.", msgs[4]);
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelMiddleRevetment}' gestart.", msgs[5]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelMiddleRevetment}'.{detailedReport}", msgs[6]);
-                    StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[7]);
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelMiddleRevetment}' beëindigd.", msgs[8]);
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelLowerBoundaryRevetment}' gestart.", msgs[9]);
-                    StringAssert.StartsWith($"Berekening '{calculation.Name}' is mislukt voor waterstand '{waterLevelLowerBoundaryRevetment}'.{detailedReport}", msgs[10]);
-                    StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[11]);
-                    Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelLowerBoundaryRevetment}' beëindigd.", msgs[12]);
-
-                    Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor alle waterstanden.", msgs[13]);
-                    StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[14]);
-                });
-                Assert.IsInstanceOf<HydraRingCalculationException>(exception);
-                Assert.AreEqual($"Berekening '{calculation.Name}' is mislukt voor alle waterstanden.", exception.Message);
-                Assert.IsNull(calculation.Output);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_InnerCalculationFails_ThrowsException()
-        {
-            // Setup
-            GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation();
-            var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism
-            {
-                Contribution = 20
-            };
-
-            var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism,
-                                                                                                                                  mockRepository);
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig())
-            {
-                TestWaveConditionsCosineCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-                calculator.EndInFailure = true;
-
-                // Call
-                TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
-                                                                                                                    grassCoverErosionOutwardsFailureMechanism,
-                                                                                                                    assessmentSectionStub,
-                                                                                                                    validFilePath);
-
-                // Assert
-                Assert.Throws<HydraRingCalculationException>(test);
-            }
-            mockRepository.VerifyAll();
-        }
-
         private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation()
         {
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj
===================================================================
diff -u -r08b3bcba439831d547684b194ecdf903f2519700 -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 08b3bcba439831d547684b194ecdf903f2519700)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -103,6 +103,10 @@
       <Project>{2331235f-1e56-4344-acc2-191c22a39594}</Project>
       <Name>Ringtoets.Revetment.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\test\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj">
+      <Project>{3706200E-48C6-4B86-B48C-4E45C69ABE95}</Project>
+      <Name>Ringtoets.Revetment.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.GrassCoverErosionOutwards.Data\Ringtoets.GrassCoverErosionOutwards.Data.csproj">
       <Project>{E7225477-577F-4A17-B7EC-6721158E1543}</Project>
       <Name>Ringtoets.GrassCoverErosionOutwards.Data</Name>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj
===================================================================
diff -u -rb28507193a2799b3e4a4e5e447693e17e1e121b5 -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision b28507193a2799b3e4a4e5e447693e17e1e121b5)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -38,6 +38,10 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -48,6 +52,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestWaveConditionsCalculation.cs" />
     <Compile Include="TestWaveConditionsOutput.cs" />
+    <Compile Include="WaveConditionsCosineCalculatorTestHelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -58,6 +63,14 @@
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
+      <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
+      <Name>Ringtoets.HydraRing.Calculation</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil\Ringtoets.HydraRing.Calculation.TestUtil.csproj">
+      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
+      <Name>Ringtoets.HydraRing.Calculation.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
@@ -67,6 +80,7 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCosineCalculatorTestHelper.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCosineCalculatorTestHelper.cs	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCosineCalculatorTestHelper.cs	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -0,0 +1,61 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Calculator;
+using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
+
+namespace Ringtoets.Revetment.TestUtil
+{
+    /// <summary>
+    /// Class that can be used to test <see cref="IWaveConditionsCosineCalculator"/>.
+    /// </summary>
+    public static class WaveConditionsCosineCalculatorTestHelper
+    {
+        /// <summary>
+        /// Gets wave conditions cosine calculators that will fail when called.
+        /// </summary>
+        public static IEnumerable<TestCaseData> FailingWaveConditionsCosineCalculators
+        {
+            get
+            {
+                yield return new TestCaseData(new TestWaveConditionsCosineCalculator
+                    {
+                        LastErrorFileContent = "LastErrorFileContent"
+                    }, $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}LastErrorFileContent")
+                    .SetName("{m:20}(LastErrorFileContent)");
+                yield return new TestCaseData(new TestWaveConditionsCosineCalculator
+                    {
+                        EndInFailure = true
+                    }, "Er is geen foutrapport beschikbaar.")
+                    .SetName("{m:20}(EndInFailure)");
+                yield return new TestCaseData(new TestWaveConditionsCosineCalculator
+                    {
+                        EndInFailure = true,
+                        LastErrorFileContent = "LastErrorFileContentAndEndInFailure"
+                    }, $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}LastErrorFileContentAndEndInFailure")
+                    .SetName("{m:20}(LastErrorFileContentAndEndInFailure)");
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/packages.config
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/packages.config	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/packages.config	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2017. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<packages>
+  <package id="NUnit" version="3.6.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/Ringtoets.Revetment.Service.Test.csproj
===================================================================
diff -u -rc5243e0c3fe02c58c2ee2ef82b383d27b643cd9d -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/Ringtoets.Revetment.Service.Test.csproj	(.../Ringtoets.Revetment.Service.Test.csproj)	(revision c5243e0c3fe02c58c2ee2ef82b383d27b643cd9d)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/Ringtoets.Revetment.Service.Test.csproj	(.../Ringtoets.Revetment.Service.Test.csproj)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -96,6 +96,10 @@
       <Project>{2331235F-1E56-4344-ACC2-191C22A39594}</Project>
       <Name>Ringtoets.Revetment.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj">
+      <Project>{3706200E-48C6-4B86-B48C-4E45C69ABE95}</Project>
+      <Name>Ringtoets.Revetment.Data.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -rc5243e0c3fe02c58c2ee2ef82b383d27b643cd9d -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision c5243e0c3fe02c58c2ee2ef82b383d27b643cd9d)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
@@ -37,6 +37,7 @@
 using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.Service.Test
 {
@@ -45,29 +46,6 @@
     {
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
-        private static IEnumerable<TestCaseData> FailingCalculators
-        {
-            get
-            {
-                yield return new TestCaseData(new TestWaveConditionsCosineCalculator
-                    {
-                        LastErrorFileContent = "LastErrorFileContent"
-                    }, $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}LastErrorFileContent")
-                    .SetName("{m}(LastErrorFileContent)");
-                yield return new TestCaseData(new TestWaveConditionsCosineCalculator
-                    {
-                        EndInFailure = true
-                    }, "Er is geen foutrapport beschikbaar.")
-                    .SetName("{m}(EndInFailure)");
-                yield return new TestCaseData(new TestWaveConditionsCosineCalculator
-                    {
-                        EndInFailure = true,
-                        LastErrorFileContent = "LastErrorFileContentAndEndInFailure"
-                    }, $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}LastErrorFileContentAndEndInFailure")
-                    .SetName("{m}(LastErrorFileContentAndEndInFailure)");
-            }
-        }
-
         [Test]
         public void Validate_InputNull_ThrowArgumentNullException()
         {
@@ -498,17 +476,15 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(FailingCalculators))]
+        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
         public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
                                                                                                    string detailedReport)
         {
             // Setup
-            var mock = new MockRepository();
-            var calculatorFactory = mock.Stub<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails);
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails);
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails);
-            mock.ReplayAll();
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails).Repeat.Times(3);
+            mockRepository.ReplayAll();
 
             var waterLevelUpperBoundaryRevetment = new RoundedDouble(2, 4.00);
             var waterLevelLowerBoundaryRevetment = new RoundedDouble(2, 3.00);
@@ -573,21 +549,21 @@
                 Assert.IsInstanceOf<HydraRingCalculationException>(exception);
                 Assert.AreEqual($"Berekening '{calculationName}' is mislukt voor alle waterstanden.", exception.Message);
             }
-            mock.VerifyAll();
+            mockRepository.VerifyAll();
         }
 
         [Test]
-        [TestCaseSource(nameof(FailingCalculators))]
+        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
         public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
                                                                                        string detailedReport)
         {
             // Setup
-            var mock = new MockRepository();
-            var calculatorFactory = mock.Stub<IHydraRingCalculatorFactory>();
+            var mockRepository = new MockRepository();
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails);
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator());
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator());
-            mock.ReplayAll();
+            mockRepository.ReplayAll();
 
             var waterLevelUpperBoundary = new RoundedDouble(2, 4.00);
             var waterLevelLowerBoundary = new RoundedDouble(2, 3.00);
@@ -641,7 +617,7 @@
 
                 AssertFailedCalculationOutput(waveConditionsOutputs[0]);
             }
-            mock.VerifyAll();
+            mockRepository.VerifyAll();
         }
 
         [Test]