Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs
===================================================================
diff -u -r0096fce3208ecd01ac37a3691df776b499fa70bb -r5f2b83cc398f5b92b96c44ef4ea7b07e0f257b72
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs	(.../DuneErosionFailureMechanism.cs)	(revision 0096fce3208ecd01ac37a3691df776b499fa70bb)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs	(.../DuneErosionFailureMechanism.cs)	(revision 5f2b83cc398f5b92b96c44ef4ea7b07e0f257b72)
@@ -50,12 +50,6 @@
             sectionResults = new ObservableList<DuneErosionFailureMechanismSectionResult>();
             GeneralInput = new GeneralDuneErosionInput();
             DuneLocations = new ObservableList<DuneLocation>();
-
-            CalculationsForMechanismSpecificFactorizedSignalingNorm = calculationsForMechanismSpecificFactorizedSignalingNorm;
-            CalculationsForMechanismSpecificSignalingNorm = calculationsForMechanismSpecificSignalingNorm;
-            CalculationsForMechanismSpecificLowerLimitNorm = calculationsForMechanismSpecificLowerLimitNorm;
-            CalculationsForLowerLimitNorm = calculationsForLowerLimitNorm;
-            CalculationsForFactorizedLowerLimitNorm = calculationsForFactorizedLowerLimitNorm;
         }
 
         public override IEnumerable<ICalculation> Calculations
@@ -79,27 +73,57 @@
         /// <summary>
         /// Gets the calculations corresponding to the mechanism specific factorized signaling norm.
         /// </summary>
-        public IObservableEnumerable<DuneLocationCalculation> CalculationsForMechanismSpecificFactorizedSignalingNorm { get; }
+        public IObservableEnumerable<DuneLocationCalculation> CalculationsForMechanismSpecificFactorizedSignalingNorm
+        {
+            get
+            {
+                return calculationsForMechanismSpecificFactorizedSignalingNorm;
+            }
+        }
 
         /// <summary>
         /// Gets the calculations corresponding to the mechanism specific signaling norm.
         /// </summary>
-        public IObservableEnumerable<DuneLocationCalculation> CalculationsForMechanismSpecificSignalingNorm { get; }
+        public IObservableEnumerable<DuneLocationCalculation> CalculationsForMechanismSpecificSignalingNorm
+        {
+            get
+            {
+                return calculationsForMechanismSpecificSignalingNorm;
+            }
+        }
 
         /// <summary>
         /// Gets the calculations corresponding to the mechanism specific lower limit norm.
         /// </summary>
-        public IObservableEnumerable<DuneLocationCalculation> CalculationsForMechanismSpecificLowerLimitNorm { get; }
+        public IObservableEnumerable<DuneLocationCalculation> CalculationsForMechanismSpecificLowerLimitNorm
+        {
+            get
+            {
+                return calculationsForMechanismSpecificLowerLimitNorm;
+            }
+        }
 
         /// <summary>
         /// Gets the calculations corresponding to the lower limit norm.
         /// </summary>
-        public IObservableEnumerable<DuneLocationCalculation> CalculationsForLowerLimitNorm { get; }
+        public IObservableEnumerable<DuneLocationCalculation> CalculationsForLowerLimitNorm
+        {
+            get
+            {
+                return calculationsForLowerLimitNorm;
+            }
+        }
 
         /// <summary>
         /// Gets the calculations corresponding to the factorized lower limit norm.
         /// </summary>
-        public IObservableEnumerable<DuneLocationCalculation> CalculationsForFactorizedLowerLimitNorm { get; set; }
+        public IObservableEnumerable<DuneLocationCalculation> CalculationsForFactorizedLowerLimitNorm
+        {
+            get
+            {
+                return calculationsForFactorizedLowerLimitNorm;
+            }
+        }
 
         public IObservableEnumerable<DuneErosionFailureMechanismSectionResult> SectionResults
         {
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Handlers/DuneLocationsReplacementHandler.cs
===================================================================
diff -u -r9643d5057d2d3ad82a43b9fd66343e278a866ea2 -r5f2b83cc398f5b92b96c44ef4ea7b07e0f257b72
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Handlers/DuneLocationsReplacementHandler.cs	(.../DuneLocationsReplacementHandler.cs)	(revision 9643d5057d2d3ad82a43b9fd66343e278a866ea2)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/Handlers/DuneLocationsReplacementHandler.cs	(.../DuneLocationsReplacementHandler.cs)	(revision 5f2b83cc398f5b92b96c44ef4ea7b07e0f257b72)
@@ -37,7 +37,6 @@
     {
         private readonly IViewCommands viewCommands;
         private readonly DuneErosionFailureMechanism failureMechanism;
-        private IEnumerable<ReadDuneLocation> newDuneLocations;
 
         /// <summary>
         /// Creates a new instance of <see cref="DuneLocationsReplacementHandler"/>.
@@ -51,10 +50,12 @@
             {
                 throw new ArgumentNullException(nameof(viewCommands));
             }
+
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
+
             this.viewCommands = viewCommands;
             this.failureMechanism = failureMechanism;
         }
@@ -69,7 +70,7 @@
         public void Replace(HydraulicBoundaryLocation[] newHydraulicBoundaryLocations)
         {
             var duneLocationsReader = new DuneLocationsReader();
-            newDuneLocations = duneLocationsReader.ReadDuneLocations();
+            IEnumerable<ReadDuneLocation> newDuneLocations = duneLocationsReader.ReadDuneLocations();
 
             DuneErosionDataSynchronizationService.SetDuneLocations(failureMechanism,
                                                                    newHydraulicBoundaryLocations,