Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs
===================================================================
diff -u -r6523 -r6526
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs	(.../EngineToMacroStabilityKernelInputTests.cs)	(revision 6523)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/EngineToMacroStabilityKernelInputTests.cs	(.../EngineToMacroStabilityKernelInputTests.cs)	(revision 6526)
@@ -57,7 +57,7 @@
     [TestCase(StabilityModelType.Bishop, TangentLinesDefinition.Specified)]
     public void GivenDamEngineDataModelWhenTransferToKernelInputThenDataIsEqual(StabilityModelType stabilityModelType, TangentLinesDefinition tangentLinesDefinition)
     {
-        // When transfer to kernel input
+        // Given DamEngine data (DamProjectData)
         DamProjectData expectedDamProjectData = FactoryForDamProjectData.CreateExampleDamProjectData();
         expectedDamProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications[0]
                               .StabilityModelType = stabilityModelType;
@@ -94,7 +94,7 @@
         }
         TrafficLoad expectedTrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput);
         
-        // Create the Macrostability kernel model
+        // When transfer to kernel input
         FullInputModelType fullInputModel = FillMacroStabilityKernelInputFromEngine.CreateFullInputModel(
             damKernelInput, expectedParametersMStab.MStabParameters, expectedWaternet, xCoordinateLowestUpliftFactorPoint);
         Assert.That(fullInputModel, Is.Not.Null);
@@ -109,15 +109,15 @@
                                                  fullInputModel.StabilityModel.ConstructionStages[0].SoilProfile.SoilSurfaces, fullInputModel.StabilityModel.Soils);
         if (stabilityModelType == StabilityModelType.UpliftVan)
         {
-            SlipCircleDefinition expectedUpliftVanCalculationGridSettings = expectedParametersMStab.MStabParameters.SlipCircleDefinition;
-            CompareUpliftVanCalculationGridSettings(expectedUpliftVanCalculationGridSettings, fullInputModel.PreprocessingInput.SearchAreaConditions);
-            bool areTangentLineSpecified = expectedUpliftVanCalculationGridSettings.UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified;
+            SlipCircleDefinition expectedUpliftVanSlipCircleDefinition = expectedParametersMStab.MStabParameters.SlipCircleDefinition;
+            CompareUpliftVanCalculationGridSettings(expectedUpliftVanSlipCircleDefinition, fullInputModel.PreprocessingInput.SearchAreaConditions);
+            bool areTangentLineSpecified = expectedUpliftVanSlipCircleDefinition.UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified;
             CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fullInputModel.StabilityModel.UpliftVanCalculationGrid, areTangentLineSpecified);
         }
         else
         {
-            SlipCircleDefinition expectedBishopCalculationGridSettings = expectedParametersMStab.MStabParameters.SlipCircleDefinition;
-            CompareBishopCalculationGridSettings(expectedBishopCalculationGridSettings, fullInputModel.PreprocessingInput.SearchAreaConditions);
+            SlipCircleDefinition expectedBishopSlipCircleDefinition = expectedParametersMStab.MStabParameters.SlipCircleDefinition;
+            CompareBishopCalculationGridSettings(expectedBishopSlipCircleDefinition, fullInputModel.PreprocessingInput.SearchAreaConditions);
             CompareBishopCalculationGrid(expectedBishopCalculationGrid, fullInputModel.StabilityModel.BishopCalculationCircle);
         }
         CompareWaternet(expectedWaternet, fullInputModel.StabilityModel.ConstructionStages[0].Waternet);
@@ -219,12 +219,12 @@
     }
 
     private static void CompareUpliftVanCalculationGridSettings(SlipCircleDefinition expectedSlipCircleDefinition,
-                                                                SearchAreaConditionsType actualSlipCircleDefinition)
+                                                                SearchAreaConditionsType actualSearchAreaConditionsType)
     {
-        Assert.That(actualSlipCircleDefinition.AutoSearchArea, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanGridSizeDetermination == GridSizeDetermination.Automatic));
-        if (actualSlipCircleDefinition.AutoTangentLines)
+        Assert.That(actualSearchAreaConditionsType.AutoSearchArea, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanGridSizeDetermination == GridSizeDetermination.Automatic));
+        if (actualSearchAreaConditionsType.AutoTangentLines)
         {
-            Assert.That(actualSlipCircleDefinition.OnlyAbovePleistoceen, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanTangentLinesDefinition == TangentLinesDefinition.Automatic));
+            Assert.That(actualSearchAreaConditionsType.OnlyAbovePleistoceen, Is.EqualTo(expectedSlipCircleDefinition.UpliftVanTangentLinesDefinition == TangentLinesDefinition.Automatic));
         }
         else
         {
@@ -233,10 +233,10 @@
     }
     
     private static void CompareBishopCalculationGridSettings(SlipCircleDefinition expectedSlipCircleDefinition,
-                                                                SearchAreaConditionsType actualSlipCircleDefinition)
+                                                                SearchAreaConditionsType actualSearchAreaConditionsType)
     {
-        Assert.That(actualSlipCircleDefinition.AutoSearchArea, Is.EqualTo(expectedSlipCircleDefinition.BishopSearchAreaDetermination == GridSizeDetermination.Automatic));
-        Assert.That(actualSlipCircleDefinition.AutoTangentLines, Is.False);
+        Assert.That(actualSearchAreaConditionsType.AutoSearchArea, Is.EqualTo(expectedSlipCircleDefinition.BishopSearchAreaDetermination == GridSizeDetermination.Automatic));
+        Assert.That(actualSearchAreaConditionsType.AutoTangentLines, Is.False);
     }
 
     private static void CompareUpliftVanCalculationGrid(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan,