Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs
===================================================================
diff -u -r5807 -r5840
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs	(.../FillDomainFromXmlCalculationParametersTests.cs)	(revision 5807)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/FillDomainFromXmlCalculationParametersTests.cs	(.../FillDomainFromXmlCalculationParametersTests.cs)	(revision 5840)
@@ -32,10 +32,15 @@
 public class FillDomainFromXmlCalculationParametersTests
 {
     [Test]
-    public void CanWriteAndReadCalculationParametersDataToXml()
+    [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Bligh)]
+    [TestCase(FailureMechanismSystemType.Piping, PipingModelType.Wti2017)]
+    [TestCase(FailureMechanismSystemType.StabilityOutside, PipingModelType.Bligh, MStabModelType.Bishop, MStabSearchMethod.Grid)]
+    [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, MStabModelType.UpliftVan, MStabSearchMethod.Grid)]
+    [TestCase(FailureMechanismSystemType.StabilityInside, PipingModelType.Bligh, MStabModelType.UpliftVan, MStabSearchMethod.BeeSwarm)]
+    public void CanWriteAndReadCalculationParametersDataToXml(FailureMechanismSystemType mechanismType, PipingModelType pipingModel = PipingModelType.Bligh, MStabModelType stabModel = MStabModelType.Bishop, MStabSearchMethod searchMethod = MStabSearchMethod.Grid)
     {
         const string filename = "CalculationParameters.xml";
-        CalculationParameters expectedData = CreateExampleCalculationParameters();
+        CalculationParameters expectedData = CreateExampleCalculationParameters(mechanismType, pipingModel, stabModel, searchMethod);
 
         // Write file
         XmlCalculationParameters writeXml = FillXmlCalculationParametersFromDomain.CreateCalculationParameters(expectedData);
@@ -47,21 +52,25 @@
         CompareCalculationParametersData(actualData, expectedData);
     }
 
-    private static CalculationParameters CreateExampleCalculationParameters()
+    private static CalculationParameters CreateExampleCalculationParameters(FailureMechanismSystemType mechanismType, PipingModelType pipingModel, MStabModelType stabModel, MStabSearchMethod searchMethod)
     {
         var calculationModules = new CalculationModules
         {
-            PipingBligh = false,
-            PipingWti = false,
-            StabilityOutside = false,
-            StabilityInside = true
+            PipingBligh = mechanismType == FailureMechanismSystemType.Piping && pipingModel == PipingModelType.Bligh,
+            PipingWti = mechanismType == FailureMechanismSystemType.Piping && pipingModel == PipingModelType.Wti2017,
+            StabilityOutside = mechanismType == FailureMechanismSystemType.StabilityOutside,
+            StabilityInside = mechanismType == FailureMechanismSystemType.StabilityInside
         };
 
-        var stabilityParameters = new MStabParameters
+        MStabParameters stabilityParameters = null;
+        if (mechanismType is FailureMechanismSystemType.StabilityOutside or FailureMechanismSystemType.StabilityInside)
         {
-            Model = MStabModelType.UpliftVan,
-            SearchMethod = MStabSearchMethod.BeeSwarm
-        };
+            stabilityParameters = new MStabParameters
+            {
+                Model = stabModel,
+                SearchMethod = searchMethod
+            };
+        }
 
         var calculationParameters = new CalculationParameters
         {
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/FillDomainFromXmlCalculationParameters.cs
===================================================================
diff -u -r5807 -r5840
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/FillDomainFromXmlCalculationParameters.cs	(.../FillDomainFromXmlCalculationParameters.cs)	(revision 5807)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/FillDomainFromXmlCalculationParameters.cs	(.../FillDomainFromXmlCalculationParameters.cs)	(revision 5840)
@@ -66,9 +66,10 @@
 
     private static void TransferStabilityParameters(XmlCalculationParametersStabilityParameters stabilityParametersXml, CalculationParameters calculationParameters)
     {
-        var stabParameters = new MStabParameters();
-        if (stabilityParametersXml != null)
+        MStabParameters stabParameters = null;
+        if (stabilityParametersXml.SearchMethodSpecified || stabilityParametersXml.CalculationModelSpecified)
         {
+            stabParameters = new MStabParameters();
             if (stabilityParametersXml.CalculationModelSpecified)
             {
                 stabParameters.Model = XmlConversionHelper.ConvertToModelType(stabilityParametersXml.CalculationModel);