Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs
===================================================================
diff -u -r71fda574a476b830bd4b767b624fb52426658701 -rf74c65d0ad7a4658f8a87a0beace37735b3ce749
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs	(.../DuneLocationsViewInfoTest.cs)	(revision 71fda574a476b830bd4b767b624fb52426658701)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationsViewInfoTest.cs	(.../DuneLocationsViewInfoTest.cs)	(revision f74c65d0ad7a4658f8a87a0beace37735b3ce749)
@@ -107,15 +107,15 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
+            var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(), 
+                                                              new DuneErosionFailureMechanism(),
+                                                              assessmentSection);
 
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
-
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
-            Assert.AreSame(failureMechanism.DuneLocations, viewData);
+            Assert.AreSame(context.WrappedData, viewData);
             mocks.VerifyAll();
         }
 
@@ -127,10 +127,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
+            var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(), 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
-
             // Call
             bool additionalDataCheck = info.AdditionalDataCheck(context);
 
@@ -146,10 +146,14 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new DuneErosionFailureMechanism();
-            failureMechanism.DuneLocations.Add(new TestDuneLocation());
+            var duneLocations = new ObservableList<DuneLocationCalculation>
+            {
+                new DuneLocationCalculation(new TestDuneLocation())
+            };
 
-            var context = new DuneLocationCalculationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection);
+            var context = new DuneLocationCalculationsContext(duneLocations, 
+                                                              new DuneErosionFailureMechanism(), 
+                                                              assessmentSection);
 
             // Call
             bool additionalDataCheck = info.AdditionalDataCheck(context);
@@ -171,7 +175,7 @@
 
             var failureMechanism = new DuneErosionFailureMechanism();
             var context = new DuneLocationCalculationsContext(
-                new ObservableList<DuneLocation>(),
+                new ObservableList<DuneLocationCalculation>(),
                 failureMechanism,
                 assessmentSection);
 
@@ -201,7 +205,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new DuneErosionFailureMechanism();
-            var locations = new ObservableList<DuneLocation>();
+            var locations = new ObservableList<DuneLocationCalculation>();
 
             var data = new DuneLocationCalculationsContext(
                 locations,