Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsPropertiesTest.cs
===================================================================
diff -u -rca1ede3f782e2d868bd15ba69694c1234a96c64e -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsPropertiesTest.cs	(.../DuneLocationCalculationsPropertiesTest.cs)	(revision ca1ede3f782e2d868bd15ba69694c1234a96c64e)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationsPropertiesTest.cs	(.../DuneLocationCalculationsPropertiesTest.cs)	(revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d)
@@ -65,6 +65,8 @@
                 Assert.IsInstanceOf<ObjectProperties<IObservableEnumerable<DuneLocationCalculation>>>(properties);
                 Assert.IsInstanceOf<IDisposable>(properties);
 
+                Assert.AreSame(duneLocationCalculations, properties.Data);
+
                 Assert.AreEqual(1, properties.Calculations.Length);
                 Assert.AreSame(calculation, properties.Calculations[0].Data);
             }
@@ -84,8 +86,6 @@
             using (var properties = new DuneLocationCalculationsProperties(duneLocationCalculations))
             {
                 // Assert
-                Assert.AreSame(duneLocationCalculations, properties.Data);
-
                 PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
                 Assert.AreEqual(1, dynamicProperties.Count);
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsWriterTest.cs
===================================================================
diff -u -rbd5cd12c211e63d9ad3be8235234449571c4460c -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsWriterTest.cs	(.../DuneLocationCalculationsWriterTest.cs)	(revision bd5cd12c211e63d9ad3be8235234449571c4460c)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationCalculationsWriterTest.cs	(.../DuneLocationCalculationsWriterTest.cs)	(revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d)
@@ -95,11 +95,11 @@
             using (var disposeHelper = new DirectoryDisposeHelper(TestHelper.GetScratchPadPath(), nameof(WriteDuneLocationCalculations_InvalidDirectoryRights_ThrowCriticalFileWriteException)))
             {
                 string filePath = Path.Combine(directoryPath, "test.bnd");
+                disposeHelper.LockDirectory(FileSystemRights.Write);
 
                 // Call
                 TestDelegate call = () => DuneLocationCalculationsWriter.WriteDuneLocationCalculations(Enumerable.Empty<DuneLocationCalculation>(), filePath);
-
-                disposeHelper.LockDirectory(FileSystemRights.Write);
+                
                 // Assert
                 var exception = Assert.Throws<CriticalFileWriteException>(call);
                 Assert.AreEqual($"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'.", exception.Message);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf5b1a012a17bbfb50abc6e7e1f95599cbcefef3f -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs)	(revision f5b1a012a17bbfb50abc6e7e1f95599cbcefef3f)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs)	(revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d)
@@ -214,13 +214,8 @@
             assessmentSection.FailureMechanismContribution.LowerLimitNorm = lowerLimitNorm;
             assessmentSection.FailureMechanismContribution.SignalingNorm = signalingNorm;
 
-            var failureMechanism = new DuneErosionFailureMechanism
-            {
-                Contribution = 5
-            };
-
             var locations = new ObservableList<DuneLocation>();
-            var calculationsGroupContext = new DuneLocationCalculationsGroupContext(locations, failureMechanism, assessmentSection);
+            var calculationsGroupContext = new DuneLocationCalculationsGroupContext(locations, new DuneErosionFailureMechanism(), assessmentSection);
 
             using (var plugin = new DuneErosionPlugin())
             {
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs
===================================================================
diff -u -r27857505f9a4350b73ad67d8017680d9b068a59d -r96238ba8b5baef941ae8a1ca49a431f1c9e4800d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs	(.../DuneErosionBoundaryCalculationActivityTest.cs)	(revision 27857505f9a4350b73ad67d8017680d9b068a59d)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs	(.../DuneErosionBoundaryCalculationActivityTest.cs)	(revision 96238ba8b5baef941ae8a1ca49a431f1c9e4800d)
@@ -394,15 +394,19 @@
         [TestCase(ActivityState.Failed)]
         [TestCase(ActivityState.Canceled)]
         [TestCase(ActivityState.Skipped)]
-        public void Finish_ActivityWithSpecificState_NotifyDuneLocation(ActivityState state)
+        public void Finish_ActivityWithSpecificState_NotifyDuneLocationCalculation(ActivityState state)
         {
             // Setup
             var duneLocation = new TestDuneLocation();
             var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
 
-            var observer = mockRepository.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-            duneLocation.Attach(observer);
+            var locationObserver = mockRepository.StrictMock<IObserver>();
+            locationObserver.Expect(o => o.UpdateObserver());
+            duneLocation.Attach(locationObserver);
+
+            var calculationObserver = mockRepository.StrictMock<IObserver>();
+            calculationObserver.Expect(o => o.UpdateObserver());
+            duneLocationCalculation.Attach(calculationObserver);
             mockRepository.ReplayAll();
 
             var activity = new DuneErosionBoundaryCalculationActivityWithState(duneLocationCalculation,