Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs	(.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs)	(revision e57e79927485e44d681b0617f17bada42dbfb862)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/DuneErosionFailureMechanismPropertyChangeHandlerTest.cs	(.../DuneErosionFailureMechanismPropertyChangeHandlerTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
@@ -265,42 +265,42 @@
                 .SetName("SetPropertyValueAfterConfirmation No Calculations");
 
             var failureMechanismOneLocationWithoutOutput = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanismOneLocationWithoutOutput);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanismOneLocationWithoutOutput);
             yield return new TestCaseData(new ChangePropertyFailureMechanismTestCase(failureMechanismOneLocationWithoutOutput))
                 .SetName("SetPropertyValueAfterConfirmation One location and all calculations without output");
 
             var failureMechanism = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanism);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanism);
             SetCalculationOutput(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm);
             yield return new TestCaseData(new ChangePropertyFailureMechanismTestCase(failureMechanism))
-                .SetName("SetPropertyValueAfterConfirmation One location and calculation failure mechanism specific factorized signaling norm with output");
+                .SetName("SetPropertyValueAfterConfirmation One location and calculation mechanism specific factorized signaling norm with output");
 
             failureMechanism = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanism);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanism);
             SetCalculationOutput(failureMechanism.CalculationsForMechanismSpecificSignalingNorm);
             yield return new TestCaseData(new ChangePropertyFailureMechanismTestCase(failureMechanism))
                 .SetName("SetPropertyValueAfterConfirmation One location and calculation mechanism specific signaling norm with output");
 
             failureMechanism = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanism);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanism);
             SetCalculationOutput(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm);
             yield return new TestCaseData(new ChangePropertyFailureMechanismTestCase(failureMechanism))
                 .SetName("SetPropertyValueAfterConfirmation One location and calculation mechanism specific lower limit norm with output");
 
             failureMechanism = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanism);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanism);
             SetCalculationOutput(failureMechanism.CalculationsForLowerLimitNorm);
             yield return new TestCaseData(new ChangePropertyFailureMechanismTestCase(failureMechanism))
                 .SetName("SetPropertyValueAfterConfirmation One location and calculation lower limit norm with output");
 
             failureMechanism = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanism);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanism);
             SetCalculationOutput(failureMechanism.CalculationsForFactorizedLowerLimitNorm);
             yield return new TestCaseData(new ChangePropertyFailureMechanismTestCase(failureMechanism))
                 .SetName("SetPropertyValueAfterConfirmation One location and calculation factorized lower limit norm with output");
 
             failureMechanism = new DuneErosionFailureMechanism();
-            ConfigureFailureMechanism(failureMechanism);
+            ConfigureFailureMechanismWithOneDuneLocation(failureMechanism);
             SetCalculationOutput(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm);
             SetCalculationOutput(failureMechanism.CalculationsForMechanismSpecificSignalingNorm);
             SetCalculationOutput(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm);
@@ -310,7 +310,7 @@
                 .SetName("SetPropertyValueAfterConfirmation One location and all calculations with output");
         }
 
-        private static void ConfigureFailureMechanism(DuneErosionFailureMechanism failureMechanism)
+        private static void ConfigureFailureMechanismWithOneDuneLocation(DuneErosionFailureMechanism failureMechanism)
         {
             var duneLocations = new[]
             {
@@ -321,8 +321,7 @@
 
         private static void SetCalculationOutput(IEnumerable<DuneLocationCalculation> calculations)
         {
-            var output = new TestDuneLocationCalculationOutput();
-            calculations.First().Output = output;
+            calculations.First().Output = new TestDuneLocationCalculationOutput();
         }
 
         private static IEnumerable ChangePropertyTestCases()
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs
===================================================================
diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs	(.../DuneLocationCalculationRowTest.cs)	(revision 649b0974fb71df7368d19682bc255618f44d49c1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs	(.../DuneLocationCalculationRowTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Globalization;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Handlers/DuneLocationsReplacementHandlerTest.cs
===================================================================
diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Handlers/DuneLocationsReplacementHandlerTest.cs	(.../DuneLocationsReplacementHandlerTest.cs)	(revision e57e79927485e44d681b0617f17bada42dbfb862)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Handlers/DuneLocationsReplacementHandlerTest.cs	(.../DuneLocationsReplacementHandlerTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
@@ -148,6 +148,11 @@
 
             // Precondition
             Assert.AreEqual(2, failureMechanism.DuneLocations.Count());
+            Assert.AreEqual(2, failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Count());
+            Assert.AreEqual(2, failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Count());
+            Assert.AreEqual(2, failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Count());
+            Assert.AreEqual(2, failureMechanism.CalculationsForLowerLimitNorm.Count());
+            Assert.AreEqual(2, failureMechanism.CalculationsForFactorizedLowerLimitNorm.Count());
 
             // Call
             handler.Replace(new[]
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs
===================================================================
diff -u -rd2a8037bae5f31d028878b7707a24935e2e89322 -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision d2a8037bae5f31d028878b7707a24935e2e89322)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
@@ -227,9 +227,9 @@
             mocks.ReplayAll();
 
             var failureMechanism = new DuneErosionFailureMechanism();
-            var locations = new ObservableList<DuneLocationCalculation>();
+            var calculations = new ObservableList<DuneLocationCalculation>();
 
-            var data = new DuneLocationCalculationsContext(locations,
+            var data = new DuneLocationCalculationsContext(calculations,
                                                            failureMechanism,
                                                            assessmentSection,
                                                            getNormFunc,
@@ -238,7 +238,7 @@
             plugin.Gui = gui;
             plugin.Activate();
 
-            using (var view = new DuneLocationCalculationsView(locations,
+            using (var view = new DuneLocationCalculationsView(calculations,
                                                                failureMechanism,
                                                                assessmentSection,
                                                                getNormFunc))
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs
===================================================================
diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision 649b0974fb71df7368d19682bc255618f44d49c1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs	(.../DuneErosionBoundaryCalculationServiceTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
@@ -316,11 +316,6 @@
                              .Return(calculator);
             mockRepository.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism
-            {
-                Contribution = 10
-            };
-
             var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation());
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs
===================================================================
diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs	(.../DuneErosionDataSynchronizationServiceTest.cs)	(revision e57e79927485e44d681b0617f17bada42dbfb862)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs	(.../DuneErosionDataSynchronizationServiceTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
@@ -218,7 +218,7 @@
         }
 
         [Test]
-        public void ClearDuneLocationOutput_locationsNull_ThrowArgumentNullException()
+        public void ClearDuneLocationOutput_LocationsNull_ThrowArgumentNullException()
         {
             // Call
             TestDelegate test = () => DuneErosionDataSynchronizationService.ClearDuneLocationOutput(null);