Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r070a656de458de1f93b626b631fc5afe72fb4761 -rf8f4f06311e58fd749631bdb933d8f8468ce56f8
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 070a656de458de1f93b626b631fc5afe72fb4761)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision f8f4f06311e58fd749631bdb933d8f8468ce56f8)
@@ -679,25 +679,15 @@
         }
 
         [Test]
-        [TestCaseSource(typeof(HydraRingCalculatorTestCaseProvider), nameof(HydraRingCalculatorTestCaseProvider.GetCalculatorFailingConditions), new object[]
+        public void Finish_ValidCalculation_NotifiesObserversOfCalculation()
         {
-            nameof(Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers)
-        })]
-        public void Finish_InvalidCalculation_DoesNotSetOutputAndNotifyObservers(bool endInFailure,
-                                                                                 string lastErrorFileContent)
-        {
             // Setup
             var mockRepository = new MockRepository();
             var observer = mockRepository.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
 
-            var calculator = new TestWaveConditionsCosineCalculator
-            {
-                EndInFailure = endInFailure,
-                LastErrorFileContent = lastErrorFileContent
-            };
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(calculator).Repeat.Times(3);
+            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(6);
             mockRepository.ReplayAll();
 
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
@@ -720,62 +710,9 @@
             activity.Finish();
 
             // Assert
-            Assert.IsNull(calculation.Output);
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void Finish_ValidCalculation_SetsOutputAndNotifyObserversOfCalculation()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var observer = mockRepository.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator
-            {
-                WaveHeight = new Random(39).NextDouble()
-            };
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(waveConditionsCosineCalculator).Repeat.Times(6);
-            mockRepository.ReplayAll();
-
-            IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
-
-            StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
-
-            calculation.Attach(observer);
-
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
-                calculation,
-                new StabilityStoneCoverFailureMechanism(),
-                assessmentSection);
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                activity.Run();
-            }
-
-            // Call
-            activity.Finish();
-
-            // Assert
-            Assert.IsNotNull(calculation.Output);
-            Assert.AreEqual(3, calculation.Output.BlocksOutput.Count());
-            foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.BlocksOutput)
-            {
-                Assert.AreEqual(waveConditionsCosineCalculator.WaveHeight, waveConditionsOutput.WaveHeight, waveConditionsOutput.WaveHeight.GetAccuracy());
-            }
-
-            Assert.AreEqual(3, calculation.Output.ColumnsOutput.Count());
-            foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.ColumnsOutput)
-            {
-                Assert.AreEqual(waveConditionsCosineCalculator.WaveHeight, waveConditionsOutput.WaveHeight, waveConditionsOutput.WaveHeight.GetAccuracy());
-            }
-
-            mockRepository.VerifyAll();
-        }
-
         private static StabilityStoneCoverWaveConditionsCalculation CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             return new StabilityStoneCoverWaveConditionsCalculation