Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r1245 -r1248
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1245)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 1248)
@@ -206,21 +206,24 @@
             Assert.IsNotNull(outputString);
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             // Bishop
-            var result = output.Results.CalculationResults.DesignResults[0].StabilityDesignResults;
-            Assert.AreEqual(1.282, result.SafetyFactor, tolerance);
-            Assert.IsNotNull(result.UpliftSituation);
-            Assert.IsTrue(result.UpliftSituation.IsUplift);
-            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType);
+            var result = output.Results.CalculationResults.DesignResults[0];
+            Assert.AreEqual(1.282, result.StabilityDesignResults.SafetyFactor, tolerance);
+            Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
+            Assert.IsTrue(result.StabilityDesignResults.UpliftSituation.IsUplift);
+            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType);
+            Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName);
             // Uplift Van
-            result = output.Results.CalculationResults.DesignResults[1].StabilityDesignResults;
-            Assert.AreEqual(1.062, result.SafetyFactor, tolerance);
-            Assert.IsNotNull(result.UpliftSituation);
-            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType);
+            result = output.Results.CalculationResults.DesignResults[1];
+            Assert.AreEqual(1.062, result.StabilityDesignResults.SafetyFactor, tolerance);
+            Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
+            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType);
+            Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName);
             // Worst of Bishop and Uplift Van 
-            result = output.Results.CalculationResults.DesignResults[2].StabilityDesignResults;
-            Assert.AreEqual(1.062, result.SafetyFactor, tolerance);
-            Assert.IsNotNull(result.UpliftSituation);
-            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType);
+            result = output.Results.CalculationResults.DesignResults[2];
+            Assert.AreEqual(1.062, result.StabilityDesignResults.SafetyFactor, tolerance);
+            Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation);
+            Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType);
+            Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName);
 
             // Calculation Result
             Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult));