Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -142,11 +142,13 @@
         }
 
         [Test]
-        [TestCase(true, "An error occurred")]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
-        public void Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent)
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed)
+        })]
+        public void Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed(bool endInFailure,
+                                                                                                       string lastErrorFileContent)
+        {
             // Setup
             var calculator = new TestStructuresClosureCalculator
             {
@@ -249,16 +251,22 @@
         }
 
         [Test]
-        public void Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation)
+        })]
+        public void Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation(bool endInFailure,
+                                                                                                    string lastErrorFileContent)
+        {
             // Setup
             var mockRepository = new MockRepository();
             var observerMock = mockRepository.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver());
 
             var calculator = new TestStructuresClosureCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             };
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath))
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs	(.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs	(.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -91,11 +91,13 @@
         }
 
         [Test]
-        [TestCase(true, "An error occurred")]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
-        public void Run_InvalidCalculationAndRan_PerformCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent)
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Run_InvalidCalculationAndRan_PerformCalculationAndActivityStateFailed)
+        })]
+        public void Run_InvalidCalculationAndRan_PerformCalculationAndActivityStateFailed(bool endInFailure,
+                                                                                          string lastErrorFileContent)
+        {
             // Setup
             var calculator = new TestDunesBoundaryConditionsCalculator
             {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -285,59 +285,13 @@
         }
 
         [Test]
-        public void Run_InvalidOvertoppingCalculationWithExceptionAndLastErrorPresent_LogErrorAndThrowException()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
         {
-            // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            ImportHydraulicBoundaryDatabase(assessmentSection);
-            AddSectionToAssessmentSection(assessmentSection);
-
-            var calculation = new GrassCoverErosionInwardsCalculation
-            {
-                InputParameters =
-                {
-                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
-                    DikeProfile = CreateDikeProfile()
-                }
-            };
-
-            var calculator = new TestOvertoppingCalculator
-            {
-                LastErrorFileContent = "An error occurred",
-                EndInFailure = true
-            };
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator);
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
-                // Call
-                Action call = () => activity.Run();
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(6, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[1]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[2]);
-                    StringAssert.StartsWith($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[3]);
-                    StringAssert.StartsWith("De overloop en overslag berekening is uitgevoerd op de tijdelijke locatie", msgs[4]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' beëindigd.", msgs[5]);
-                });
-                Assert.AreEqual(ActivityState.Failed, activity.State);
-            }
-
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Run_InvalidOvertoppingCalculationWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException()
+            nameof(Run_InvalidOvertoppingCalculationAndRan_LogErrorAndActivityStateFailed)
+        })]
+        public void Run_InvalidOvertoppingCalculationAndRan_LogErrorAndActivityStateFailed(bool endInFailure,
+                                                                                           string lastErrorFileContent,
+                                                                                           string detailedReport)
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
@@ -352,60 +306,11 @@
                     DikeProfile = CreateDikeProfile()
                 }
             };
-            var calculator = new TestOvertoppingCalculator
-            {
-                EndInFailure = true
-            };
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator);
-            mockRepository.ReplayAll();
 
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection);
-
-                // Call
-                Action call = () => activity.Run();
-
-                // Assert
-                TestHelper.AssertLogMessages(call, messages =>
-                {
-                    string[] msgs = messages.ToArray();
-                    Assert.AreEqual(6, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[1]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[2]);
-                    Assert.AreEqual($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Er is geen foutrapport beschikbaar.", msgs[3]);
-                    StringAssert.StartsWith("De overloop en overslag berekening is uitgevoerd op de tijdelijke locatie", msgs[4]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' beëindigd.", msgs[5]);
-                });
-                Assert.AreEqual(ActivityState.Failed, activity.State);
-            }
-
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Run_InvalidOvertoppingCalculationWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException()
-        {
-            // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            ImportHydraulicBoundaryDatabase(assessmentSection);
-            AddSectionToAssessmentSection(assessmentSection);
-
-            var calculation = new GrassCoverErosionInwardsCalculation
-            {
-                InputParameters =
-                {
-                    HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
-                    DikeProfile = CreateDikeProfile()
-                }
-            };
             var calculator = new TestOvertoppingCalculator
             {
-                LastErrorFileContent = "An error occurred",
-                EndInFailure = false
+                LastErrorFileContent = lastErrorFileContent,
+                EndInFailure = endInFailure
             };
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -427,7 +332,7 @@
                     Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
                     Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[1]);
                     Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[2]);
-                    StringAssert.StartsWith($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[3]);
+                    Assert.AreEqual($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. {detailedReport}", msgs[3]);
                     StringAssert.StartsWith("De overloop en overslag berekening is uitgevoerd op de tijdelijke locatie", msgs[4]);
                     Assert.AreEqual($"Berekening van '{calculation.Name}' beëindigd.", msgs[5]);
                 });
@@ -484,16 +389,22 @@
         }
 
         [Test]
-        public void Finish_InvalidOvertoppingCalculation_DoesNotSetOutputAndNotifyObservers()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Finish_InvalidOvertoppingCalculation_DoesNotSetOutputAndNotifyObservers)
+        })]
+        public void Finish_InvalidOvertoppingCalculation_DoesNotSetOutputAndNotifyObservers(bool endInFailure,
+                                                                                            string lastErrorFileContent)
+        {
             // Setup
             var mockRepository = new MockRepository();
             var observerMock = mockRepository.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver());
 
             var calculator = new TestOvertoppingCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             };
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -357,9 +357,10 @@
         }
 
         [Test]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
-        [TestCase(true, "An error occurred")]
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        {
+            nameof(Run_ErrorInCalculation_ActivityStateFailed)
+        })]
         public void Run_ErrorInCalculation_ActivityStateFailed(bool endInFailure, string lastErrorFileContent)
         {
             // Setup
@@ -403,8 +404,12 @@
         }
 
         [Test]
-        public void Run_CalculationFailed_OutputNull()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Run_CalculationFailed_OutputNull)
+        })]
+        public void Run_CalculationFailed_OutputNull(bool endInFailure, string lastErrorFileContent)
+        {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
@@ -418,7 +423,8 @@
 
             var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             };
 
             int nrOfCalculators = calculation.InputParameters.WaterLevels.Count();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r7044ef7d789aec3c3d9dd2c6f38b3699bea0444b -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 7044ef7d789aec3c3d9dd2c6f38b3699bea0444b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -40,7 +40,6 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
-using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Service.Test
 {
@@ -655,8 +654,12 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError)
+        })]
+        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(bool endInFailure,
+                                                                                                   string lastErrorFileContent,
                                                                                                    string detailedReport)
         {
             // Setup
@@ -665,6 +668,11 @@
                 Contribution = 20
             };
 
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath))
@@ -736,8 +744,12 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError)
+        })]
+        public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(bool endInFailure,
+                                                                                       string lastErrorFileContent,
                                                                                        string detailedReport)
         {
             // Setup
@@ -746,6 +758,11 @@
                 Contribution = 20
             };
 
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath))
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj
===================================================================
diff -u -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -103,10 +103,6 @@
       <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/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -141,9 +141,10 @@
         }
 
         [Test]
-        [TestCase(true, "An error occurred")]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        {
+            nameof(Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed)
+        })]
         public void Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent)
         {
             // Setup
@@ -246,16 +247,21 @@
         }
 
         [Test]
-        public void Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation)
+        })]
+        public void Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation(bool endInFailure, string lastErrorFileContent)
+        {
             // Setup
             var mockRepository = new MockRepository();
             var observerMock = mockRepository.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver());
 
             var calculator = new TestStructuresOvertoppingCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             };
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(calculator);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/HydraRingCalculatorTestCaseProvider.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/HydraRingCalculatorTestCaseProvider.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/HydraRingCalculatorTestCaseProvider.cs	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -0,0 +1,102 @@
+// 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;
+
+namespace Ringtoets.HydraRing.Calculation.TestUtil.Calculator
+{
+    /// <summary>
+    /// Class that provide test cases which can be used to test objects using hydra ring calculators.
+    /// </summary>
+    public static class HydraRingCalculatorTestCaseProvider
+    {
+        /// <summary>
+        /// Gets test cases of calculators that will fail when called, including the detailed error message that should be set.
+        /// </summary>
+        /// <param name="testName">The name of the test.</param>
+        /// <returns>The test cases of calculators that will fail when called.</returns>
+        /// <example>
+        /// <code>
+        /// [Test]
+        /// [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        /// {
+        ///     nameof(testName)
+        /// })]
+        /// public void testName(bool endInFailure, string lastErrorFileContent, string detailedReport)
+        /// </code>
+        /// </example>
+        public static IEnumerable<TestCaseData> GetCalculatorFailingConditionsWithReportDetails(string testName)
+        {
+            yield return new TestCaseData(false,
+                                          "LastErrorFileContent",
+                                          $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}LastErrorFileContent")
+                .SetName(CreateTestName(testName, "LastErrorFileContent"));
+            yield return new TestCaseData(true,
+                                          null,
+                                          "Er is geen foutrapport beschikbaar.")
+                .SetName(CreateTestName(testName, "EndInFailure"));
+            yield return new TestCaseData(true,
+                                          "LastErrorFileContentAndEndInFailure",
+                                          $"Bekijk het foutrapport door op details te klikken.{Environment.NewLine}LastErrorFileContentAndEndInFailure")
+                .SetName(CreateTestName(testName, "LastErrorFileContentAndEndInFailure"));
+        }
+
+        /// <summary>
+        /// Gets test cases of calculators that will fail when called.
+        /// </summary>
+        /// <param name="testName">The name of the test.</param>
+        /// <returns>The test cases of calculators that will fail when called.</returns>
+        /// <example>
+        /// <code>
+        /// [Test]
+        /// [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        /// {
+        ///     nameof(testName)
+        /// })]
+        /// public void testName(bool endInFailure, string lastErrorFileContent)
+        /// </code>
+        /// </example>
+        public static IEnumerable<TestCaseData> GetCalculatorFailingConditions(string testName)
+        {
+            yield return new TestCaseData(false,
+                                          "LastErrorFileContent")
+                .SetName(CreateTestName(testName, "LastErrorFileContent"));
+            yield return new TestCaseData(true,
+                                          null)
+                .SetName(CreateTestName(testName, "EndInFailure"));
+            yield return new TestCaseData(true,
+                                          "LastErrorFileContentAndEndInFailure")
+                .SetName(CreateTestName(testName, "LastErrorFileContentAndEndInFailure"));
+        }
+
+        private static string CreateTestName(string testName, string parameter)
+        {
+            string parameters = $"({parameter})";
+            int newLength = parameters.Length < testName.Length
+                                ? testName.Length - parameters.Length
+                                : testName.Length;
+            string shortenedTestName = testName.Substring(0, newLength);
+            return string.Concat(shortenedTestName, parameters);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj	(.../Ringtoets.HydraRing.Calculation.TestUtil.csproj)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj	(.../Ringtoets.HydraRing.Calculation.TestUtil.csproj)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -53,6 +53,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Calculator\HydraRingCalculatorFactoryConfig.cs" />
+    <Compile Include="Calculator\HydraRingCalculatorTestCaseProvider.cs" />
     <Compile Include="HydraRingDataEqualityHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Calculator\TestHydraRingCalculatorFactory.cs" />
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj
===================================================================
diff -u -r260a05afbf1ef2b3466e1588b7ef5fccbe52c43b -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 260a05afbf1ef2b3466e1588b7ef5fccbe52c43b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -38,10 +38,6 @@
     <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>
@@ -52,7 +48,6 @@
     <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">
@@ -63,14 +58,6 @@
       <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>
@@ -80,7 +67,6 @@
     <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. 
Fisheye: Tag 6c049c504e7f599a8cebb26ae37fcd82b03782f2 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsCosineCalculatorTestHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6c049c504e7f599a8cebb26ae37fcd82b03782f2 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -rbb8a619893b78cc8081813837bb5123d3af1e40d -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision bb8a619893b78cc8081813837bb5123d3af1e40d)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -37,7 +37,6 @@
 using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
-using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.Service.Test
 {
@@ -485,8 +484,12 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError)
+        })]
+        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(bool endInFailure,
+                                                                                                   string lastErrorFileContent,
                                                                                                    string detailedReport)
         {
             // Setup
@@ -503,6 +506,12 @@
 
             int nrOfCalculators = input.WaterLevels.Count();
 
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
+
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath))
@@ -568,11 +577,20 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError)
+        })]
+        public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(bool endInFailure,
+                                                                                       string lastErrorFileContent,
                                                                                        string detailedReport)
         {
             // Setup
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs	(.../StabilityPointStructuresCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -144,9 +144,10 @@
         }
 
         [Test]
-        [TestCase(true, "An error occurred")]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        {
+            nameof(Run_InvalidCalculationRan_PerformValidationAndCalculationActivityStateFailed)
+        })]
         public void Run_InvalidCalculationRan_PerformValidationAndCalculationActivityStateFailed(bool endInFailure, string lastErrorFileContent)
         {
             // Setup
@@ -255,16 +256,21 @@
         }
 
         [Test]
-        public void Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation)
+        })]
+        public void Finish_InvalidCalculationAndRan_DoesNotSetOutputAndNotifyObserversOfCalculation(bool endInFailure, string lastErrorFileContent)
+        {
             // Setup
             var mockRepository = new MockRepository();
             var observerMock = mockRepository.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver());
 
             var calculator = new TestStructuresStabilityPointCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             };
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath))
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -410,9 +410,10 @@
         }
 
         [Test]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
-        [TestCase(true, "An error occurred")]
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        {
+            nameof(Run_ErrorInCalculation_ActivityStateFailed)
+        })]
         public void Run_ErrorInCalculation_ActivityStateFailed(bool endInFailure, string lastErrorFileContent)
         {
             // Setup
@@ -445,8 +446,12 @@
         }
 
         [Test]
-        public void Run_CalculationFailed_OutputNull()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Run_CalculationFailed_OutputNull)
+        })]
+        public void Run_CalculationFailed_OutputNull(bool endInFailure, string lastErrorFileContent)
+        {
             // Setup
             var mockRepository = new MockRepository();
             StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation();
@@ -460,7 +465,8 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             }).Repeat.Times(calculation.InputParameters.WaterLevels.Count());
             mockRepository.ReplayAll();
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r7044ef7d789aec3c3d9dd2c6f38b3699bea0444b -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 7044ef7d789aec3c3d9dd2c6f38b3699bea0444b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -38,7 +38,6 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
-using Ringtoets.Revetment.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 
 namespace Ringtoets.StabilityStoneCover.Service.Test
@@ -717,15 +716,24 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError)
+        })]
+        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(bool endInFailure,
+                                                                                                   string lastErrorFileContent,
                                                                                                    string detailedReport)
         {
             // Setup
             var failureMechanism = new StabilityStoneCoverFailureMechanism
             {
                 Contribution = 20
             };
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -796,15 +804,24 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_OneOutOfThreeBlocksCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_OneOutOfThreeBlocksCalculationsFails_ReturnsOutputsAndLogError)
+        })]
+        public void Calculate_OneOutOfThreeBlocksCalculationsFails_ReturnsOutputsAndLogError(bool endInFailure,
+                                                                                             string lastErrorFileContent,
                                                                                              string detailedReport)
         {
             // Setup
             var failureMechanism = new StabilityStoneCoverFailureMechanism
             {
                 Contribution = 20
             };
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
@@ -884,15 +901,24 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_OneOutOfThreeColumnsCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_OneOutOfThreeColumnsCalculationsFails_ReturnsOutputsAndLogError)
+        })]
+        public void Calculate_OneOutOfThreeColumnsCalculationsFails_ReturnsOutputsAndLogError(bool endInFailure,
+                                                                                              string lastErrorFileContent,
                                                                                               string detailedReport)
         {
             // Setup
             var failureMechanism = new StabilityStoneCoverFailureMechanism
             {
                 Contribution = 20
             };
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -264,8 +264,12 @@
         }
 
         [Test]
-        public void Run_CalculationFailed_OutputNull()
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
         {
+            nameof(Run_CalculationFailed_OutputNull)
+        })]
+        public void Run_CalculationFailed_OutputNull(bool endInFailure, string lastErrorFileContent)
+        {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
@@ -279,7 +283,8 @@
 
             var calculator = new TestWaveConditionsCosineCalculator
             {
-                EndInFailure = true
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
             };
             int nrOfCalculators = calculation.InputParameters.WaterLevels.Count();
 
@@ -303,9 +308,10 @@
         }
 
         [Test]
-        [TestCase(true, null)]
-        [TestCase(false, "An error occurred")]
-        [TestCase(true, "An error occurred")]
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        {
+            nameof(Run_ErrorInCalculation_ActivityStateFailed)
+        })]
         public void Run_ErrorInCalculation_ActivityStateFailed(bool endInFailure, string lastErrorFileContent)
         {
             // Setup
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj
===================================================================
diff -u -r9f43dc146675fb7116a46f591489b4b0f00c5267 -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj)	(revision 9f43dc146675fb7116a46f591489b4b0f00c5267)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -101,10 +101,6 @@
       <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.WaveImpactAsphaltCover.Data\Ringtoets.WaveImpactAsphaltCover.Data.csproj">
       <Project>{567E0B69-5280-41CE-ADD6-443725A61C86}</Project>
       <Name>Ringtoets.WaveImpactAsphaltCover.Data</Name>
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r7044ef7d789aec3c3d9dd2c6f38b3699bea0444b -r6c049c504e7f599a8cebb26ae37fcd82b03782f2
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 7044ef7d789aec3c3d9dd2c6f38b3699bea0444b)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
@@ -38,7 +38,6 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
-using Ringtoets.Revetment.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Service.Test
@@ -641,15 +640,24 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError)
+        })]
+        public void Calculate_ThreeCalculationsFail_ThrowsHydraRingCalculationExceptionAndLogError(bool endInFailure,
+                                                                                                   string lastErrorFileContent,
                                                                                                    string detailedReport)
         {
             // Setup
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism
             {
                 Contribution = 20
             };
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -723,15 +731,24 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(WaveConditionsCosineCalculatorTestHelper), nameof(WaveConditionsCosineCalculatorTestHelper.FailingWaveConditionsCosineCalculators))]
-        public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(TestWaveConditionsCosineCalculator calculatorThatFails,
+        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditionsWithReportDetails), new object[]
+        {
+            nameof(Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError)
+        })]
+        public void Calculate_OneOutOfThreeCalculationsFails_ReturnsOutputsAndLogError(bool endInFailure,
+                                                                                       string lastErrorFileContent,
                                                                                        string detailedReport)
         {
             // Setup
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism
             {
                 Contribution = 20
             };
+            var calculatorThatFails = new TestWaveConditionsCosineCalculator
+            {
+                EndInFailure = endInFailure,
+                LastErrorFileContent = lastErrorFileContent
+            };
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();