Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs
===================================================================
diff -u -reb26afe8d09aa16bb61f1624c0786e13218320a9 -reeb27f17b6f6f712bb8586ce1b93643d2e709d4e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision eb26afe8d09aa16bb61f1624c0786e13218320a9)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs	(.../StructuresInputBasePropertiesTest.cs)	(revision eeb27f17b6f6f712bb8586ce1b93643d2e709d4e)
@@ -299,7 +299,7 @@
         }
 
         [Test]
-        public void GetSelectableLocations_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsStructure_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
             var failureMechanism = mockRepository.Stub<IFailureMechanism>();
@@ -330,26 +330,27 @@
                 inputContext,
                 new SimpleStructuresInputProperties.ConstructionProperties());
 
-            var distanceToPropertiesStructureLocation =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.StructureLocation));
-            var distanceToInputStructureLocation =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(calculation.InputParameters.Structure.Location));
-
-            // Pre-condition
-            Assert.AreNotEqual(distanceToPropertiesStructureLocation, distanceToInputStructureLocation);
-
             // Call 
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
                 properties.GetSelectableHydraulicBoundaryLocations();
 
             // Assert
+            double distanceToPropertiesStructureLocation =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.StructureLocation);
+            double distanceToInputStructureLocation =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(calculation.InputParameters.Structure.Location);
+            Assert.AreEqual(59, distanceToPropertiesStructureLocation, 1);
+            Assert.AreEqual(60, distanceToInputStructureLocation, 1);
+
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
             RoundedDouble itemDistance = hydraulicBoundaryLocationItem.Distance;
             Assert.AreEqual(distanceToInputStructureLocation, itemDistance, itemDistance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
-        public void SelectedLocation_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void SelectedHydraulicBoundaryLocation_InputWithLocationsStructure_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
             var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
@@ -374,26 +375,27 @@
                 inputContext,
                 new SimpleStructuresInputProperties.ConstructionProperties());
 
-            var distanceToPropertiesStructureLocation =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.StructureLocation));
-            var distanceToInputStructureLocation =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(calculation.InputParameters.Structure.Location));
-
-            // Pre-condition
-            Assert.AreNotEqual(distanceToPropertiesStructureLocation, distanceToInputStructureLocation);
-
             // Call 
             var selectedHydraulicBoundaryLocation = properties.SelectedHydraulicBoundaryLocation;
 
             // Assert
+            double distanceToPropertiesStructureLocation =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.StructureLocation);
+            double distanceToInputStructureLocation =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(calculation.InputParameters.Structure.Location);
+            Assert.AreEqual(59, distanceToPropertiesStructureLocation, 1);
+            Assert.AreEqual(60, distanceToInputStructureLocation, 1);
+
             RoundedDouble selectedLocationDistance = selectedHydraulicBoundaryLocation.Distance;
             Assert.AreEqual(distanceToInputStructureLocation, selectedLocationDistance, selectedLocationDistance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
-        public void SelectedLocation_InputWithLocationsDikeProfile_HasSameDistanceAsSelectableBoundaryLocationsItem()
+        public void GivenPropertiesWithStructureAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
-            // Setup
+            // Given
             var failureMechanism = mockRepository.Stub<IFailureMechanism>();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
@@ -423,16 +425,17 @@
                 inputContext,
                 new SimpleStructuresInputProperties.ConstructionProperties());
 
-            // Call
+            // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
                 properties.GetSelectableHydraulicBoundaryLocations();
             SelectableHydraulicBoundaryLocation selectedLocation = properties.SelectedHydraulicBoundaryLocation;
 
-            // Assert
+            // Then
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
-
             Assert.AreEqual(selectedLocation.Distance, hydraulicBoundaryLocationItem.Distance,
                             hydraulicBoundaryLocationItem.Distance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -rc2d4ac4a0d7737fae7a2b9ddd30d6d67d016db15 -reeb27f17b6f6f712bb8586ce1b93643d2e709d4e
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision c2d4ac4a0d7737fae7a2b9ddd30d6d67d016db15)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision eeb27f17b6f6f712bb8586ce1b93643d2e709d4e)
@@ -302,7 +302,7 @@
         }
 
         [Test]
-        public void GetSelectableLocations_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
@@ -327,26 +327,27 @@
                 Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection)
             };
 
-            var distanceToPropertiesWorldReferencePoint =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint));
-            var distanceToDikeProfileWorldReferencePoint =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.DikeProfile.WorldReferencePoint));
-
-            // Pre-condition
-            Assert.AreNotEqual(distanceToPropertiesWorldReferencePoint, distanceToDikeProfileWorldReferencePoint);
-
             // Call 
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
                 properties.GetSelectableHydraulicBoundaryLocations();
 
             // Assert
+            double distanceToPropertiesWorldReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint);
+            double distanceToDikeProfileWorldReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.DikeProfile.WorldReferencePoint);
+            Assert.AreEqual(59, distanceToPropertiesWorldReferencePoint, 1);
+            Assert.AreEqual(60, distanceToDikeProfileWorldReferencePoint, 1);
+
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
             RoundedDouble itemDistance = hydraulicBoundaryLocationItem.Distance;
             Assert.AreEqual(distanceToDikeProfileWorldReferencePoint, itemDistance, itemDistance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
-        public void SelectedLocation_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void SelectedHydraulicBoundaryLocation_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
@@ -366,24 +367,25 @@
                 Data = new GrassCoverErosionInwardsInputContext(input, calculation, failureMechanism, assessmentSection)
             };
 
-            var distanceToPropertiesWorldReferencePoint =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint));
-            var distanceToDikeProfileWorldReferencePoint =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.DikeProfile.WorldReferencePoint));
-
-            // Pre-condition
-            Assert.AreNotEqual(distanceToPropertiesWorldReferencePoint, distanceToDikeProfileWorldReferencePoint);
-
             // Call 
             var selectedHydraulicBoundaryLocation = properties.SelectedHydraulicBoundaryLocation;
 
             // Assert
+            double distanceToPropertiesWorldReferencePoint =
+               hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint);
+            double distanceToDikeProfileWorldReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.DikeProfile.WorldReferencePoint);
+            Assert.AreEqual(59, distanceToPropertiesWorldReferencePoint, 1);
+            Assert.AreEqual(60, distanceToDikeProfileWorldReferencePoint, 1);
+
             RoundedDouble selectedLocationDistance = selectedHydraulicBoundaryLocation.Distance;
             Assert.AreEqual(distanceToDikeProfileWorldReferencePoint, selectedLocationDistance, selectedLocationDistance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
-        public void SelectedLocation_InputWithLocationsDikeProfile_HasSameDistanceAsSelectableBoundaryLocationsItem()
+        public void GivenPropertiesWithDikeProfileAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
             // Setup
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
@@ -416,9 +418,10 @@
 
             // Assert
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
-
             Assert.AreEqual(selectedLocation.Distance, hydraulicBoundaryLocationItem.Distance,
                             hydraulicBoundaryLocationItem.Distance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -rc9d6635631573a4d98d234ec21d48e3346498030 -reeb27f17b6f6f712bb8586ce1b93643d2e709d4e
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision c9d6635631573a4d98d234ec21d48e3346498030)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision eeb27f17b6f6f712bb8586ce1b93643d2e709d4e)
@@ -1492,9 +1492,9 @@
         }
 
         [Test]
-        public void GetSelectableLocations_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void GivenPropertiesWithSurfaceLineAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
-            // Setup
+            // Given
             var mockRepository = new MockRepository();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
@@ -1529,16 +1529,17 @@
                 StochasticSoilProfile = soilProfile
             };
 
-            // Call
+            // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
                 properties.GetSelectableHydraulicBoundaryLocations();
             SelectableHydraulicBoundaryLocation selectedLocation = properties.SelectedHydraulicBoundaryLocation;
 
-            // Assert
+            // Then
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
-
             Assert.AreEqual(selectedLocation.Distance, hydraulicBoundaryLocationItem.Distance,
                             hydraulicBoundaryLocationItem.Distance.GetAccuracy());
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -reb26afe8d09aa16bb61f1624c0786e13218320a9 -reeb27f17b6f6f712bb8586ce1b93643d2e709d4e
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision eb26afe8d09aa16bb61f1624c0786e13218320a9)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision eeb27f17b6f6f712bb8586ce1b93643d2e709d4e)
@@ -402,7 +402,7 @@
         }
 
         [Test]
-        public void GetSelectableLocations_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void GetSelectableHydraulicBoundaryLocations_InputWithLocationsForeshoreProfile_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
@@ -419,26 +419,25 @@
 
             var properties = new TestWaveConditionsInputContextProperties(inputContext);
 
-            var distanceToPropertiesStructureLocation =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint));
-            var distanceToForeshoreProfileReferencePoint =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.ForeshoreProfile.WorldReferencePoint));
-
-            // Pre-condition
-            Assert.AreNotEqual(distanceToPropertiesStructureLocation, distanceToForeshoreProfileReferencePoint);
-
             // Call 
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
                 properties.GetSelectableHydraulicBoundaryLocations();
 
             // Assert
+            double distanceToPropertiesWorldReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint);
+            double distanceToForeshoreProfileReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.ForeshoreProfile.WorldReferencePoint);
+            Assert.AreEqual(59, distanceToPropertiesWorldReferencePoint, 1);
+            Assert.AreEqual(60, distanceToForeshoreProfileReferencePoint, 1);
+
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
             RoundedDouble itemDistance = hydraulicBoundaryLocationItem.Distance;
             Assert.AreEqual(distanceToForeshoreProfileReferencePoint, itemDistance, itemDistance.GetAccuracy());
         }
 
         [Test]
-        public void SelectedLocation_InputWithLocationsDikeProfile_CalculatesDistanceWithCorrectReferencePoint()
+        public void SelectedHydraulicBoundaryLocation_InputWithLocationsForeshoreProfile_CalculatesDistanceWithCorrectReferencePoint()
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
@@ -450,26 +449,25 @@
             var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]);
             var properties = new TestWaveConditionsInputContextProperties(inputContext);
 
-            var distanceToPropertiesWorldReferenceLocation =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint));
-            var distanceToForeshoreProfileWorldReferencePoint =
-                new RoundedDouble(0, hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.ForeshoreProfile.WorldReferencePoint));
-
-            // Pre-condition
-            Assert.AreNotEqual(distanceToPropertiesWorldReferenceLocation, distanceToForeshoreProfileWorldReferencePoint);
-
             // Call 
             var selectedHydraulicBoundaryLocation = properties.SelectedHydraulicBoundaryLocation;
 
             // Assert
+            double distanceToPropertiesWorldReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(properties.WorldReferencePoint);
+            double distanceToForeshoreProfileReferencePoint =
+                hydraulicBoundaryLocation.Location.GetEuclideanDistanceTo(input.ForeshoreProfile.WorldReferencePoint);
+            Assert.AreEqual(59, distanceToPropertiesWorldReferencePoint, 1);
+            Assert.AreEqual(60, distanceToForeshoreProfileReferencePoint, 1);
+
             RoundedDouble selectedLocationDistance = selectedHydraulicBoundaryLocation.Distance;
-            Assert.AreEqual(distanceToForeshoreProfileWorldReferencePoint, selectedLocationDistance, selectedLocationDistance.GetAccuracy());
+            Assert.AreEqual(distanceToForeshoreProfileReferencePoint, selectedLocationDistance, selectedLocationDistance.GetAccuracy());
         }
 
         [Test]
-        public void SelectedLocation_InputWithLocationsDikeProfile_HasSameDistanceAsSelectableBoundaryLocationsItem()
+        public void GivenPropertiesWithForeshoreProfileAndLocations_WhenSelectingLocation_ThenSelectedLocationDistanceSameAsLocationItem()
         {
-            // Setup
+            // Given
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25);
             var locations = new List<HydraulicBoundaryLocation>
             {
@@ -485,14 +483,13 @@
 
             var properties = new TestWaveConditionsInputContextProperties(inputContext);
 
-            // Call
+            // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
                 properties.GetSelectableHydraulicBoundaryLocations();
             SelectableHydraulicBoundaryLocation selectedLocation = properties.SelectedHydraulicBoundaryLocation;
 
-            // Assert
+            // Then
             var hydraulicBoundaryLocationItem = availableHydraulicBoundaryLocations.ToArray()[0];
-
             Assert.AreEqual(selectedLocation.Distance, hydraulicBoundaryLocationItem.Distance,
                             hydraulicBoundaryLocationItem.Distance.GetAccuracy());
         }