Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs
===================================================================
diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -recd632baa887a9a0372290acb402f30ada87c6c7
--- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs	(.../FileImportActivityTest.cs)	(revision 76948e8765899b35776102ecd211d3d7575a9e4d)
+++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs	(.../FileImportActivityTest.cs)	(revision ecd632baa887a9a0372290acb402f30ada87c6c7)
@@ -221,6 +221,27 @@
             mocks.VerifyAll();
         }
 
+        [Test]
+        public void Finish_FileImportActivityWithFileImporterObservableTargetAndNoneState_ObserversOfTargetAreNotNotified()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+            mocks.ReplayAll();
+
+            var target = new ObservableList<object>();
+            target.Attach(observer);
+
+            var fileImporter = new SimpleFileImporter<ObservableList<object>>(target);
+            var fileImportActivity = new TestFileImportActivity(fileImporter, "", ActivityState.None);
+
+            // Call
+            fileImportActivity.Finish();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
         private class SimpleFileImporter<T> : FileImporterBase<T>
         {
             public SimpleFileImporter(T importTarget) : base("", importTarget) {}
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs
===================================================================
diff -u -r2be0d424c3105095d6589a3674b7e910d79050ea -recd632baa887a9a0372290acb402f30ada87c6c7
--- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs	(.../TreeViewControlTest.cs)	(revision 2be0d424c3105095d6589a3674b7e910d79050ea)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs	(.../TreeViewControlTest.cs)	(revision ecd632baa887a9a0372290acb402f30ada87c6c7)
@@ -1920,7 +1920,13 @@
             /// <summary>
             /// Gets the data (before or after modification).
             /// </summary>
-            public object[] Data => data.ToArray();
+            public object[] Data
+            {
+                get
+                {
+                    return data.ToArray();
+                }
+            }
 
             /// <summary>
             /// Modifies the data.
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityBaseTest.cs
===================================================================
diff -u -r7be1cc916e7e9b1b992b5658e1a719331a17fe9e -recd632baa887a9a0372290acb402f30ada87c6c7
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityBaseTest.cs	(.../HydraRingActivityBaseTest.cs)	(revision 7be1cc916e7e9b1b992b5658e1a719331a17fe9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityBaseTest.cs	(.../HydraRingActivityBaseTest.cs)	(revision ecd632baa887a9a0372290acb402f30ada87c6c7)
@@ -71,20 +71,6 @@
         }
 
         [Test]
-        public void Cancel_Always_StateCanceledCanceledTrue()
-        {
-            // Setup
-            var activity = new TestHydraRingActivity();
-
-            // Call
-            activity.Cancel();
-
-            // Assert
-            Assert.AreEqual(activity.State, ActivityState.Canceled);
-            Assert.IsTrue(activity.Canceled);
-        }
-
-        [Test]
         public void UpdateProgressText_Always_SetsProgressTextWithFormat()
         {
             // Setup
@@ -97,14 +83,12 @@
             activity.PublicUpdateProgressText(currentStepName, currentStep, totalStep);
 
             // Assert
-            Assert.AreEqual(string.Format("Stap {0} van {1} | {2}", currentStep, totalStep, currentStepName), activity.ProgressText);
+            Assert.AreEqual($"Stap {currentStep} van {totalStep} | {currentStepName}", activity.ProgressText);
         }
     }
 
     public class TestHydraRingActivity : HydraRingActivityBase
     {
-        public bool Canceled { get; private set; }
-        public bool Finished { get; private set; }
         public bool Calculated { get; private set; }
 
         public bool IsValid { private get; set; }
@@ -114,15 +98,9 @@
             UpdateProgressText(currentStepName, currentStep, totalStep);
         }
 
-        protected override void OnCancel()
-        {
-            Canceled = true;
-        }
+        protected override void OnCancel() {}
 
-        protected override void OnFinish()
-        {
-            Finished = true;
-        }
+        protected override void OnFinish() {}
 
         protected override void PerformCalculation()
         {