Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 -rfa1dc23daebf3b0d1e04f701262370420f8314f7
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision f8f4f06311e58fd749631bdb933d8f8468ce56f8)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision fa1dc23daebf3b0d1e04f701262370420f8314f7)
@@ -701,15 +701,21 @@
         }
 
         [Test]
-        public void Finish_ValidCalculation_NotifiesObserversOfCalculation()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Finish_VariousCalculationEndStates_NotifiesObserversOfCalculation(bool endInFailure)
         {
             // Setup
             var mockRepository = new MockRepository();
             var observer = mockRepository.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
 
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3);
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty))
+                             .Return(new TestWaveConditionsCosineCalculator
+                             {
+                                 EndInFailure = endInFailure
+                             });
             mockRepository.ReplayAll();
 
             AssessmentSectionStub assessmentSection = CreateAssessmentSection();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r999a9c70c1fd234bf757f26580682296ecc6b4cd -rfa1dc23daebf3b0d1e04f701262370420f8314f7
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 999a9c70c1fd234bf757f26580682296ecc6b4cd)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision fa1dc23daebf3b0d1e04f701262370420f8314f7)
@@ -672,15 +672,21 @@
         }
 
         [Test]
-        public void Finish_ValidCalculation_NotifiesObserversOfCalculation()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Finish_VariousCalculationEndStates_NotifiesObserversOfCalculation(bool endInFailure)
         {
             // Setup
             var mockRepository = new MockRepository();
             var observer = mockRepository.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
 
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(6);
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty))
+                             .Return(new TestWaveConditionsCosineCalculator
+                             {
+                                 EndInFailure = endInFailure
+                             });
             mockRepository.ReplayAll();
 
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf8f4f06311e58fd749631bdb933d8f8468ce56f8 -rfa1dc23daebf3b0d1e04f701262370420f8314f7
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision f8f4f06311e58fd749631bdb933d8f8468ce56f8)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision fa1dc23daebf3b0d1e04f701262370420f8314f7)
@@ -527,8 +527,11 @@
             StabilityStoneCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation);
             StabilityStoneCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation);
             List<ICalculationBase> calculations = failureMechanism.WaveConditionsCalculationGroup.Children;
-            calculations.Add(calculationA);
-            calculations.Add(calculationB);
+            calculations.AddRange(new[]
+            {
+                calculationA,
+                calculationB
+            });
 
             var nodeData = new StabilityStoneCoverFailureMechanismContext(failureMechanism,
                                                                           assessmentSection);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r999a9c70c1fd234bf757f26580682296ecc6b4cd -rfa1dc23daebf3b0d1e04f701262370420f8314f7
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 999a9c70c1fd234bf757f26580682296ecc6b4cd)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision fa1dc23daebf3b0d1e04f701262370420f8314f7)
@@ -583,15 +583,21 @@
         }
 
         [Test]
-        public void Finish_ValidCalculation_NotifiesObserversOfCalculation()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Finish_VariousCalculationEndStates_NotifiesObserversOfCalculation(bool endInFailure)
         {
             // Setup
             var mockRepository = new MockRepository();
             var observer = mockRepository.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
 
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3);
+            var calculatorFactory = mockRepository.Stub<IHydraRingCalculatorFactory>();
+            calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty))
+                             .Return(new TestWaveConditionsCosineCalculator
+                             {
+                                 EndInFailure = endInFailure
+                             });
             mockRepository.ReplayAll();
 
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r999a9c70c1fd234bf757f26580682296ecc6b4cd -rfa1dc23daebf3b0d1e04f701262370420f8314f7
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision 999a9c70c1fd234bf757f26580682296ecc6b4cd)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision fa1dc23daebf3b0d1e04f701262370420f8314f7)
@@ -527,8 +527,11 @@
             WaveImpactAsphaltCoverWaveConditionsCalculation calculationA = GetValidCalculation(hydraulicBoundaryLocation);
             WaveImpactAsphaltCoverWaveConditionsCalculation calculationB = GetValidCalculation(hydraulicBoundaryLocation);
             List<ICalculationBase> calculations = failureMechanism.WaveConditionsCalculationGroup.Children;
-            calculations.Add(calculationA);
-            calculations.Add(calculationB);
+            calculations.AddRange(new[]
+            {
+                calculationA,
+                calculationB
+            });
 
             var nodeData = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism,
                                                                              assessmentSection);