Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs
===================================================================
diff -u -r6263 -r6953
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs	(.../FillDomainFromXmlCalculationParametersTests.cs)	(revision 6263)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs	(.../FillDomainFromXmlCalculationParametersTests.cs)	(revision 6953)
@@ -35,54 +35,39 @@
     [Test]
     [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Bligh)]
     [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Wti2017)]
-    [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Bligh, StabilityModelType.Bishop, StabilitySearchMethod.Grid)]
-    [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, StabilityModelType.UpliftVan, StabilitySearchMethod.Grid)]
-    [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, StabilityModelType.UpliftVan, StabilitySearchMethod.BeeSwarm)]
-    public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Bligh, StabilityModelType stabModel = StabilityModelType.Bishop, StabilitySearchMethod searchMethod = StabilitySearchMethod.Grid)
+    [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Wti2017, StabilityModelType.Bishop, StabilitySearchMethod.Grid)]
+    [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Wti2017, StabilityModelType.UpliftVan, StabilitySearchMethod.Grid)]
+    [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Wti2017, StabilityModelType.UpliftVan, StabilitySearchMethod.BeeSwarm)]
+    public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Wti2017, StabilityModelType stabModel = StabilityModelType.UpliftVan, StabilitySearchMethod searchMethod = StabilitySearchMethod.BeeSwarm)
     {
         const string filename = "CalculationParameters.xml";
-        CalculationParameters expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod);
+        DamFailureMechanismeCalculationSpecification expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod);
 
         // Write file
         XmlCalculationParameters writeXml = FillXmlCalculationParametersFromDomain.CreateCalculationParameters(expectedData);
         CalculationParametersXmlSerialization.SaveAsXmlFile(filename, writeXml);
 
         // Load file
         XmlCalculationParameters readXml = CalculationParametersXmlSerialization.LoadFromXmlFile(filename);
-        CalculationParameters actualData = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(readXml);
+        DamFailureMechanismeCalculationSpecification actualData = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(readXml);
         CompareCalculationParametersData(actualData, expectedData);
     }
 
-    private static CalculationParameters CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod)
+    private static DamFailureMechanismeCalculationSpecification CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, 
+        PipingModelType pipingModel, StabilityModelType stabModel, StabilitySearchMethod searchMethod)
     {
-        var calculationModules = new CalculationModules
+        var calculationSpecification = new DamFailureMechanismeCalculationSpecification
         {
-            PipingBligh = mechanismType == FailureMechanismSystemType.Piping && pipingModel == PipingModelType.Bligh,
-            PipingWti = mechanismType == FailureMechanismSystemType.Piping && pipingModel == PipingModelType.Wti2017,
-            StabilityOutside = mechanismType == FailureMechanismSystemType.StabilityOutside,
-            StabilityInside = mechanismType == FailureMechanismSystemType.StabilityInside
+            FailureMechanismSystemType = mechanismType,
+            PipingModelType = pipingModel,
+            StabilityModelType = stabModel,
+            SearchMethod = searchMethod
         };
-
-        MStabParameters stabilityParameters = null;
-        if (mechanismType is FailureMechanismSystemType.StabilityOutside or FailureMechanismSystemType.StabilityInside)
-        {
-            stabilityParameters = new MStabParameters
-            {
-                Model = stabModel,
-                SearchMethod = searchMethod
-            };
-        }
-
-        var calculationParameters = new CalculationParameters
-        {
-            CalculationModules = calculationModules,
-            StabilityParameters = stabilityParameters
-        };
-
-        return calculationParameters;
+        return calculationSpecification;
     }
 
-    private static void CompareCalculationParametersData(CalculationParameters actual, CalculationParameters expected)
+    private static void CompareCalculationParametersData(DamFailureMechanismeCalculationSpecification actual, 
+                                                         DamFailureMechanismeCalculationSpecification expected)
     {
         var compare = new CompareLogic
         {