Index: Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs
===================================================================
diff -u -ra1ab943def9d63df83137f4d14b103fcea0ba778 -r7abb391b5067105a9026a89b6076bf0b8b9315a3
--- Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision a1ab943def9d63df83137f4d14b103fcea0ba778)
+++ Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision 7abb391b5067105a9026a89b6076bf0b8b9315a3)
@@ -132,7 +132,7 @@
         [TestCase(ActivityState.Failed, "Uitvoeren van '' is mislukt.")]
         [TestCase(ActivityState.Canceled, "Uitvoeren van '' is geannuleerd.")]
         [TestCase(ActivityState.Skipped, "Uitvoeren van '' is overgeslagen.")]
-        public void Finish_ActivityWithCertainStateAndSuccessfulFinish_MessageIsSendToLogAndStateIsPreserved(ActivityState state, string message)
+        public void Finish_ActivityWithSpecificStateAndSuccessfulFinish_MessageIsSendToLogAndStateIsPreserved(ActivityState state, string message)
         {
             // Setup
             var activity = new SimpleActivity(false, false, false, state);
@@ -161,7 +161,7 @@
         [TestCase(ActivityState.Executed)]
         [TestCase(ActivityState.Canceled)]
         [TestCase(ActivityState.Skipped)]
-        public void Finish_ActivityWithCertainStateAndFailingFinish_MessageIsSendToLogAndStateIsChangedToFailed(ActivityState state)
+        public void Finish_ActivityWithSpecificStateAndFailingFinish_MessageIsSendToLogAndStateIsChangedToFailed(ActivityState state)
         {
             // Setup
             var activity = new SimpleActivity(false, false, true, state);
Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r7abb391b5067105a9026a89b6076bf0b8b9315a3
--- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs	(.../FileImportActivityTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs	(.../FileImportActivityTest.cs)	(revision 7abb391b5067105a9026a89b6076bf0b8b9315a3)
@@ -196,7 +196,11 @@
         }
 
         [Test]
-        public void Finish_FileImportActivityWithFileImporterAndObservableTarget_ObserversOfTargetAreNotified()
+        [TestCase(ActivityState.Executed)]
+        [TestCase(ActivityState.Failed)]
+        [TestCase(ActivityState.Canceled)]
+        [TestCase(ActivityState.Skipped)]
+        public void Finish_FileImportActivityWithFileImporterObservableTargetAndSpecificState_ObserversOfTargetAreNotified(ActivityState state)
         {
             // Setup
             var mocks = new MockRepository();
@@ -208,7 +212,7 @@
             target.Attach(observer);
 
             var fileImporter = new SimpleFileImporter<ObservableList<object>>(target);
-            var fileImportActivity = new FileImportActivity(fileImporter, "");
+            var fileImportActivity = new TestFileImportActivity(fileImporter, "", state);
 
             // Call
             fileImportActivity.Finish();
@@ -230,5 +234,14 @@
                 return false;
             }
         }
+
+        private class TestFileImportActivity : FileImportActivity
+        {
+            public TestFileImportActivity(IFileImporter fileImporter, string name, ActivityState state)
+                : base(fileImporter, name)
+            {
+                State = state;
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r7be1cc916e7e9b1b992b5658e1a719331a17fe9e -r7abb391b5067105a9026a89b6076bf0b8b9315a3
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 7be1cc916e7e9b1b992b5658e1a719331a17fe9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 7abb391b5067105a9026a89b6076bf0b8b9315a3)
@@ -424,7 +424,7 @@
         [TestCase(ActivityState.Failed)]
         [TestCase(ActivityState.Canceled)]
         [TestCase(ActivityState.Skipped)]
-        public void Finish_CalculationWithCertainState_NotifyHydraulicBoundaryLocation(ActivityState state)
+        public void Finish_ActivityWithSpecificState_NotifyHydraulicBoundaryLocation(ActivityState state)
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r7be1cc916e7e9b1b992b5658e1a719331a17fe9e -r7abb391b5067105a9026a89b6076bf0b8b9315a3
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 7be1cc916e7e9b1b992b5658e1a719331a17fe9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 7abb391b5067105a9026a89b6076bf0b8b9315a3)
@@ -405,11 +405,12 @@
             mockRepository.VerifyAll();
         }
 
+        [Test]
         [TestCase(ActivityState.Executed)]
         [TestCase(ActivityState.Failed)]
         [TestCase(ActivityState.Canceled)]
         [TestCase(ActivityState.Skipped)]
-        public void Finish_CalculationWithCertainState_NotifyHydraulicBoundaryLocation(ActivityState state)
+        public void Finish_ActivityWithSpecificState_NotifyHydraulicBoundaryLocation(ActivityState state)
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();