Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r595 -r597
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 595)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 597)
@@ -81,10 +81,10 @@
             Dike dike = damProjectData.Dike;
             FillSurfaceLines(dike);
             FillSoils(dike);
-            FillLocations(dike);
             FillSoilProfiles1D(dike);
             FillSoilProfiles2D(dike);
             FillSegments(damProjectData);
+            FillLocations(dike, damProjectData.Segments);
             return damProjectData;
         }
 
@@ -149,7 +149,7 @@
             AddPointToSurfaceLine(surfaceLine, 24.0, 1.0, CharacteristicPointType.SurfaceLevelInside);
         }
 
-        private static void FillLocations(Dike dike)
+        private static void FillLocations(Dike dike, IList<Segment> segments)
         {
             const int locationCount = 3;
             for (int i = 0; i < locationCount; i++)
@@ -176,6 +176,7 @@
                 location.HeadPl3 = 1.0 * i + 0.25;
                 location.HeadPl4 = 1.0 * i + 0.21;
                 location.SurfaceLine = dike.SurfaceLines2[i];
+                location.Segment = segments[i % 2]; // alternate between the 2 available segments
                 for (int j = 0; j < 3; j++)
                 {
                     var designScenario = FillDesignScenario((i +1) * (j + 1)); // The parameter factor is used to create unique data for the design scenarios