Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -racca39f8e27f0fc74521a290ae5404227e3e646e
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision acca39f8e27f0fc74521a290ae5404227e3e646e)
@@ -249,9 +249,12 @@
                 Assert.IsNull(calculation.Output);
             }
         }
-
+        
         [Test]
-        public void Run_UnexplainedErrorInCalculation_ActivityStateFailed()
+        [TestCase(true, null)]
+        [TestCase(false, "An error occurred")]
+        [TestCase(true, "An error occurred")]
+        public void Run_ErrorInCalculation_ActivityStateFailed(bool endInFailure, string lastErrorFileContent)
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
@@ -269,7 +272,8 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-                calculator.EndInFailure = true;
+                calculator.EndInFailure = endInFailure;
+                calculator.LastErrorFileContent = lastErrorFileContent;
 
                 // Call
                 activity.Run();
@@ -279,36 +283,6 @@
             }
         }
 
-        [Test]
-        public void Run_ErrorInCalculation_ActivityStateFailed()
-        {
-            // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-
-            using (var importer = new HydraulicBoundaryDatabaseImporter())
-            {
-                importer.Import(assessmentSection, validFilePath);
-            }
-
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-
-            WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection);
-
-            var activity = new WaveImpactAsphaltCoverWaveConditionsCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection);
-            using (new HydraRingCalculatorFactoryConfig())
-            {
-                var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator;
-                calculator.EndInFailure = false;
-                calculator.LastErrorFileContent = "An error occurred";
-
-                // Call
-                activity.Run();
-
-                // Assert
-                Assert.AreEqual(ActivityState.Failed, activity.State);
-            }
-        }
-
         private static WaveImpactAsphaltCoverWaveConditionsCalculation GetValidCalculation(AssessmentSection assessmentSection)
         {
             var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation