Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -r2b5c91f2bd6369a53ab9e89915707f98ce553463 -r53906164cce5013cd047b7a72f3c7179a089eef2
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationCalculationsContextPropertyInfoTest.cs	(.../DuneLocationCalculationsContextPropertyInfoTest.cs)	(revision 2b5c91f2bd6369a53ab9e89915707f98ce553463)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationCalculationsContextPropertyInfoTest.cs	(.../DuneLocationCalculationsContextPropertyInfoTest.cs)	(revision 53906164cce5013cd047b7a72f3c7179a089eef2)
@@ -51,7 +51,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithContext_SetsDuneLocationsAsData()
+        public void CreateInstance_WithContext_SetsDuneLocationCalculationsAsData()
         {
             // Setup
             var mockRepository = new MockRepository();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -r53906164cce5013cd047b7a72f3c7179a089eef2
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsContextTreeNodeInfoTest.cs)	(revision e57e79927485e44d681b0617f17bada42dbfb862)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsContextTreeNodeInfoTest.cs)	(revision 53906164cce5013cd047b7a72f3c7179a089eef2)
@@ -326,7 +326,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllLocationsAndNotifyObservers()
+        public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllCalculationsAndNotifyObservers()
         {
             // Setup
             using (var treeViewControl = new TreeViewControl())
@@ -436,7 +436,7 @@
         }
 
         [Test]
-        public void CalculateDuneLocationsFromContextMenu_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_SendsRightInputToCalculationService()
+        public void PerformDuneLocationCalculationsFromContextMenu_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_SendsRightInputToCalculationService()
         {
             // Setup
             const double norm = 0.01;
@@ -514,7 +514,7 @@
         }
 
         [Test]
-        public void CalculateDuneLocationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_SendsRightInputToCalculationService()
+        public void PerformDuneLocationCalculationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_SendsRightInputToCalculationService()
         {
             // Setup
             const double norm = 0.01;
@@ -595,7 +595,7 @@
         }
 
         [Test]
-        public void CalculateDuneLocationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_SendsRightInputToCalculationService()
+        public void PerformDuneLocationCalculationsFromContextMenu_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_SendsRightInputToCalculationService()
         {
             // Setup
             const double norm = 0.01;
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs
===================================================================
diff -u -rfa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed -r53906164cce5013cd047b7a72f3c7179a089eef2
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision fa7c0cafcf8f4360aa3997d2c27e3db7e5bcafed)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision 53906164cce5013cd047b7a72f3c7179a089eef2)
@@ -135,7 +135,7 @@
         }
 
         [Test]
-        public void AdditionalDataCheck_LocationsEmpty_ReturnFalse()
+        public void AdditionalDataCheck_CalculationsEmpty_ReturnFalse()
         {
             // Setup
             var mocks = new MockRepository();
@@ -156,19 +156,19 @@
         }
 
         [Test]
-        public void AdditionalDataCheck_WithLocations_ReturnTrue()
+        public void AdditionalDataCheck_WithCalculations_ReturnTrue()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var duneLocations = new ObservableList<DuneLocationCalculation>
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
             {
                 new DuneLocationCalculation(new TestDuneLocation())
             };
 
-            var context = new DuneLocationCalculationsContext(duneLocations,
+            var context = new DuneLocationCalculationsContext(duneLocationCalculations,
                                                               new DuneErosionFailureMechanism(),
                                                               assessmentSection,
                                                               () => 0.01,
@@ -434,7 +434,7 @@
                                                                () => 0.01))
             {
                 // Call
-                bool closeForData = info.CloseForData(view, new object());
+                bool closeForData = info.CloseForData(view, null);
 
                 // Assert
                 Assert.IsFalse(closeForData);