Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs
===================================================================
diff -u -r1169 -r1170
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs	(.../MacroStabilityTests.cs)	(revision 1169)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs	(.../MacroStabilityTests.cs)	(revision 1170)
@@ -526,11 +526,14 @@
         }
 
         [Test]
-        public void TestRunMacroStabilityDeltaDijkForbiddenZoneBishop()
+        public void TestRunMacroStabilityInvoer10ForbiddenZoneBishop()
         {
-            // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\DeltaDijk_zonering_BI
+            // Expected results are determined by running dam\dam clients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType.damx
             // with Dam Classic rev.1059
-            // Two locations with same profile
+            // Select locations DWP_10_2 and DWP_10_6
+            // Analysis type "No adaption"
+            // Calculation options: Stability Inside - Bishop
+            // This tests two locations with same profile
             // But first location with Zone Areas and second location with Forbidden Zone
             const string calcDir = "TestOutStabForbiddenZoneBishop";
             if (Directory.Exists(calcDir))
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/Invoer10.xml
===================================================================
diff -u -r1105 -r1170
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/Invoer10.xml	(.../Invoer10.xml)	(revision 1105)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/Invoer10.xml	(.../Invoer10.xml)	(revision 1170)
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" ProjectPath="D:\aaaTmpFiles\Dam\Invoer10 - UI" CalculationMap="ZoneType.Calc">
+<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" ProjectPath="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\Invoer10" CalculationMap="ZoneType.Calc" MaxCalculationCores="1">
   <Locations>
-    <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_2" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14">
+    <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_2" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14" DikeTableHeight="0">
+      <AssesmentRegionalOptions BoezemLevelLbp="-987654321" BoezemLevelTp="-987654321" BoezemLevelHbp="-987654321" DetrimentFactor="0.95" DredgingDepth="0" RegionalBankProtectionBottomLevel="0" />
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="-1" HeadPl2="0" DampingFactorPL3="0" DampingFactorPL4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0.2" Pl1BelowToeDikePolderside="0.2" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="1.5" RiverLevelLow="0" DikeTableHeight="3.8" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="1.5" HeadPl4="1.5" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.17" RequiredSafetyFactorStabilityOuterSlope="1.17" RequiredSafetyFactorPiping="1.2" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="ZoneType.geometries2D.0\" SoilDatabaseName="D:\aaaTmpFiles\Dam\Invoer10 - UI\ZoneType0.soilmaterials.mdb" ZoneType="1" ForbiddenZoneFactor="0" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="ZoneType.geometries2D.0\" SoilDatabaseName="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType0.soilmaterials.mdb" ZoneType="1" ForbiddenZoneFactor="0" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <ModelFactors />
     </Location>
-    <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_6" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14">
+    <Location SurfaceLineName="DWP_10" SegmentName="DWP_10" Name="DWP_10_6" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="8.14" DikeTableHeight="0">
+      <AssesmentRegionalOptions BoezemLevelLbp="-987654321" BoezemLevelTp="-987654321" BoezemLevelHbp="-987654321" DetrimentFactor="0.95" DredgingDepth="0" RegionalBankProtectionBottomLevel="0" />
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="-1" HeadPl2="0" DampingFactorPL3="0" DampingFactorPL4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0.2" Pl1BelowToeDikePolderside="0.2" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="1.5" RiverLevelLow="0" DikeTableHeight="3.8" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="1.5" HeadPl4="1.5" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.17" RequiredSafetyFactorStabilityOuterSlope="1.17" RequiredSafetyFactorPiping="1.2" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="ZoneType.geometries2D.0\" SoilDatabaseName="D:\aaaTmpFiles\Dam\Invoer10 - UI\ZoneType0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="ZoneType.geometries2D.0\" SoilDatabaseName="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\Invoer10\ZoneType0.soilmaterials.mdb" ZoneType="2" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <ModelFactors />
     </Location>
   </Locations>
   <SurfaceLines>