Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs
===================================================================
diff -u -r2515 -r2529
--- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 2515)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs	(.../LoadCompatiblityTest.cs)	(revision 2529)
@@ -92,10 +92,7 @@
                            YRd = 507197.06382921,
                            SegmentId = "234",
                            PolderLevel = -1.29999995232,
-                           RiverLevel = 0,
                            HeadPL2 = -1.3,
-                           HeadPl3 = -1.6,
-                           HeadPl4 = null,
                            XSoilGeometry2DOrigin = 0.0, // actual value
                            DikeEmbankmentMaterial = "HHNK1_Bfg",
                            ShoulderEmbankmentMaterial = "HHNK1_Bfl",
@@ -104,23 +101,12 @@
                            PenetrationLength = 0.0, // actual value
                            TrafficLoad = 5.0,
                            PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD,
-                           PlLineOffsetBelowDikeTopAtRiver = 0.0, // actual value
-                           PlLineOffsetBelowDikeTopAtPolder = 0.0, // actual value
-                           PlLineOffsetBelowShoulderBaseInside = 0.25,
-                           PlLineOffsetBelowDikeToeAtPolder = 0.0, // actual value
                            StabilityShoulderGrowSlope = 0.333333333333333,
                            StabilityShoulderGrowDeltaX = 2.0,
                            StabilitySlopeAdaptionDeltaX = 2.0,
                            MinimalCircleDepth = 1.5,
                            DistanceToEntryPoint = 0.0, // actual value
                            StabilityZoneType = MStabZonesType.NoZones,
-                           DikeTableHeight = 0.0,
-                           ModelFactors = new ModelFactors
-                                              {
-                                                  UpliftCriterionPiping = 1.2,
-                                                  UpliftCriterionStability = 1.2,
-
-                                              },
                            Segment = new Segment
                                          {
                                              Name = "234" , 
@@ -231,72 +217,21 @@
 
         /// <summary>
         /// Determines whether version_1_5_1_7 can be loaded. 
-        /// Check if the PL-line parameters are correcly copied from location to scenario; Projects before 15.1 do not have these parameters in scenarios
         /// </summary>
         [Test]
         [Category("Integration")]
         public void CanLoadVersion_1_5_1_7_ScenariosPLLineParameters()
         {
-            const double cTolerance = 0.001;
             const string projectFilenameTutorialDesign = @"..\..\..\data\Dam\Versions\V 1.5.1.7\Tutorial Design\DAM Tutorial Design (Old 1.5.1.7).damx";
             using (var projectData = ProjectLoader.LoadProjectData(projectFilenameTutorialDesign))
             {
                 foreach (Location location in projectData.Locations)
                 {
-                    foreach (Scenario scenario in location.Scenarios)
-                    {
-                        if (location.UsePlLineOffsetBelowDikeCrestMiddle != null)
-                        {
-                            Assert.AreEqual(location.UsePlLineOffsetBelowDikeCrestMiddle.Value, scenario.UsePlLineOffsetBelowDikeCrestMiddle.Value);
-                        }
-                        if (location.PlLineOffsetBelowDikeCrestMiddle != null)
-                        {
-                            Assert.AreEqual(location.PlLineOffsetBelowDikeCrestMiddle.Value, scenario.PlLineOffsetBelowDikeCrestMiddle.Value, cTolerance);
-                        }
-
-                        if (scenario.PlLineOffsetBelowDikeToeAtPolder.HasValue)
-                        {
-                            Assert.AreEqual(location.PlLineOffsetBelowDikeToeAtPolder, scenario.PlLineOffsetBelowDikeToeAtPolder, cTolerance);
-                        }
-
-                        if (scenario.PlLineOffsetBelowDikeTopAtPolder.HasValue)
-                        {
-                            Assert.AreEqual(location.PlLineOffsetBelowDikeTopAtPolder, scenario.PlLineOffsetBelowDikeTopAtPolder, cTolerance);
-                        }
-
-                        if (scenario.PlLineOffsetBelowDikeTopAtRiver.HasValue)
-                        {
-                            Assert.AreEqual(location.PlLineOffsetBelowDikeTopAtRiver, scenario.PlLineOffsetBelowDikeTopAtRiver, cTolerance);
-                        }
-
-                        if (scenario.PlLineOffsetBelowShoulderBaseInside.HasValue)
-                        {
-                            Assert.AreEqual(location.PlLineOffsetBelowShoulderBaseInside, scenario.PlLineOffsetBelowShoulderBaseInside, cTolerance);
-                        }
-
-                        if (location.UsePlLineOffsetFactorBelowShoulderCrest != null)
-                        {
-                            Assert.AreEqual(location.UsePlLineOffsetFactorBelowShoulderCrest.Value, scenario.UsePlLineOffsetFactorBelowShoulderCrest.Value);
-                        }
-                        if (location.PlLineOffsetFactorBelowShoulderCrest != null)
-                        {
-                            Assert.AreEqual(location.PlLineOffsetFactorBelowShoulderCrest.Value, scenario.PlLineOffsetFactorBelowShoulderCrest.Value, cTolerance);
-                        }
-                        if (location.HeadPl3 != null && scenario.HeadPl3.HasValue)
-                        {
-                            Assert.AreEqual(location.HeadPl3.Value, scenario.HeadPl3.Value, cTolerance);
-                        }
-                        if (location.HeadPl4 != null && scenario.HeadPl4.HasValue)
-                        {
-                            Assert.AreEqual(location.HeadPl4.Value, scenario.HeadPl4.Value, cTolerance);
-                        }
-
-                        // surfaceline2 present with characteristic points ?
-                        Assert.NotNull(location.SurfaceLine2);
-                        Assert.AreEqual(location.Name, location.SurfaceLine2.Name);
-                        Assert.AreEqual(true, location.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint);
-                        Assert.AreEqual(true, location.SurfaceLine2.HasDike());
-                    }
+                    // surfaceline2 present with characteristic points ?
+                    Assert.NotNull(location.SurfaceLine2);
+                    Assert.AreEqual(location.Name, location.SurfaceLine2.Name);
+                    Assert.AreEqual(true, location.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint);
+                    Assert.AreEqual(true, location.SurfaceLine2.HasDike());
                 }
             }
         }