Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r55319647c90efabfada9d4e3dcef3ac041f3a33e
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 55319647c90efabfada9d4e3dcef3ac041f3a33e)
@@ -25,7 +25,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
 using Core.Common.Util;
@@ -389,14 +388,14 @@
                 {
                     DuneLocationCalculations =
                     {
-                        new DuneLocationCalculation(new DuneLocation(1300001, locationName1, new Point2D(0, 0), new DuneLocation.ConstructionProperties
+                        new DuneLocationCalculation(new DuneLocation(locationName1, new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0), new DuneLocation.ConstructionProperties
                         {
                             CoastalAreaId = 0,
                             Offset = 0,
                             Orientation = 0,
                             D50 = 0.000007
                         })),
-                        new DuneLocationCalculation(new DuneLocation(1300002, locationName2, new Point2D(0, 0), new DuneLocation.ConstructionProperties
+                        new DuneLocationCalculation(new DuneLocation(locationName2, new HydraulicBoundaryLocation(1300002, string.Empty, 0, 0), new DuneLocation.ConstructionProperties
                         {
                             CoastalAreaId = 0,
                             Offset = 0,
@@ -500,7 +499,7 @@
             {
                 DuneLocationCalculations =
                 {
-                    new DuneLocationCalculation(new DuneLocation(1300001, "A", new Point2D(0, 0), new DuneLocation.ConstructionProperties
+                    new DuneLocationCalculation(new DuneLocation("A", new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0), new DuneLocation.ConstructionProperties
                     {
                         CoastalAreaId = 0,
                         Offset = 0,
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r55319647c90efabfada9d4e3dcef3ac041f3a33e
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 55319647c90efabfada9d4e3dcef3ac041f3a33e)
@@ -22,7 +22,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Common.Base.Service;
 using Core.Common.TestUtil;
 using Core.Common.Util;
@@ -93,8 +92,8 @@
 
             AssessmentSectionStub assessmentSection = CreateAssessmentSection(usePreprocessorClosure);
 
-            var duneLocation1 = new DuneLocation(1, "locationName1", new Point2D(1, 1), new DuneLocation.ConstructionProperties());
-            var duneLocation2 = new DuneLocation(2, "locationName2", new Point2D(2, 2), new DuneLocation.ConstructionProperties());
+            var duneLocation1 = new DuneLocation("locationName1", new HydraulicBoundaryLocation(1, string.Empty, 1, 1), new DuneLocation.ConstructionProperties());
+            var duneLocation2 = new DuneLocation("locationName2", new HydraulicBoundaryLocation(2, string.Empty, 2, 2), new DuneLocation.ConstructionProperties());
 
             // Call
             CalculatableActivity[] activities = DuneLocationCalculationActivityFactory.CreateCalculationActivities(
@@ -166,8 +165,8 @@
                 }
             };
 
-            var duneLocation1 = new DuneLocation(1, "locationName1", new Point2D(1, 1), new DuneLocation.ConstructionProperties());
-            var duneLocation2 = new DuneLocation(2, "locationName2", new Point2D(2, 2), new DuneLocation.ConstructionProperties());
+            var duneLocation1 = new DuneLocation("locationName1", new HydraulicBoundaryLocation(1, string.Empty, 1, 1), new DuneLocation.ConstructionProperties());
+            var duneLocation2 = new DuneLocation("locationName2", new HydraulicBoundaryLocation(2, string.Empty, 2, 2), new DuneLocation.ConstructionProperties());
 
             failureMechanism.SetDuneLocations(new[]
             {
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs
===================================================================
diff -u -rf372efff12e4bcf8a9d2d5865429431925f5ee5b -r55319647c90efabfada9d4e3dcef3ac041f3a33e
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs	(.../DuneLocationCalculationServiceTest.cs)	(revision f372efff12e4bcf8a9d2d5865429431925f5ee5b)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs	(.../DuneLocationCalculationServiceTest.cs)	(revision 55319647c90efabfada9d4e3dcef3ac041f3a33e)
@@ -22,7 +22,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using Core.Common.Util;
 using NUnit.Framework;
@@ -141,7 +140,7 @@
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
 
-            var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0),
+            var duneLocation = new DuneLocation("test", new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0),
                                                 new DuneLocation.ConstructionProperties
                                                 {
                                                     CoastalAreaId = 0,