Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableCalculationSettingsFactory.cs
===================================================================
diff -u -r8171fe8a5f3ebe8ee2bd77fccaf30dd86b05f9c0 -r0a705d53bb78780c46906b841cbfe938dabc09af
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableCalculationSettingsFactory.cs	(.../PersistableCalculationSettingsFactory.cs)	(revision 8171fe8a5f3ebe8ee2bd77fccaf30dd86b05f9c0)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableCalculationSettingsFactory.cs	(.../PersistableCalculationSettingsFactory.cs)	(revision 0a705d53bb78780c46906b841cbfe938dabc09af)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Components.Persistence.Stability.Data;
 using Riskeer.MacroStabilityInwards.Data;
 
@@ -58,6 +59,7 @@
 
             PersistableCalculationSettings dailySettings = Create(idFactory, registry, MacroStabilityInwardsExportStageType.Daily);
             PersistableCalculationSettings extremeSettings = Create(idFactory, registry, MacroStabilityInwardsExportStageType.Extreme);
+            dailySettings.AnalysisType = PersistableAnalysisType.UpliftVan;
             extremeSettings.AnalysisType = PersistableAnalysisType.UpliftVan;
             extremeSettings.UpliftVan = new PersistableUpliftVanSettings
             {
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs
===================================================================
diff -u -rab73638550f443ee7841f9d5619cd3bf3fa99bcb -r0a705d53bb78780c46906b841cbfe938dabc09af
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs	(.../PersistableDataModelTestHelper.cs)	(revision ab73638550f443ee7841f9d5619cd3bf3fa99bcb)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs	(.../PersistableDataModelTestHelper.cs)	(revision 0a705d53bb78780c46906b841cbfe938dabc09af)
@@ -124,22 +124,22 @@
         public static void AssertCalculationSettings(MacroStabilityInwardsSlidingCurve slidingCurve, IEnumerable<PersistableCalculationSettings> calculationSettings)
         {
             Assert.AreEqual(2, calculationSettings.Count());
-            PersistableCalculationSettings emptyCalculationSettings = calculationSettings.First();
+            PersistableCalculationSettings dailyCalculationSettings = calculationSettings.First();
 
-            Assert.AreEqual("0", emptyCalculationSettings.Id);
-            Assert.IsNull(emptyCalculationSettings.AnalysisType);
-            Assert.IsNull(emptyCalculationSettings.CalculationType);
-            Assert.IsNull(emptyCalculationSettings.UpliftVan);
+            Assert.IsNotNull(dailyCalculationSettings.Id);
+            Assert.AreEqual(PersistableAnalysisType.UpliftVan, dailyCalculationSettings.AnalysisType);
+            Assert.IsNull(dailyCalculationSettings.CalculationType);
+            Assert.IsNull(dailyCalculationSettings.UpliftVan);
 
-            PersistableCalculationSettings actualCalculationSettings = calculationSettings.Last();
-            Assert.AreEqual("1", actualCalculationSettings.Id);
-            Assert.AreEqual(PersistableAnalysisType.UpliftVan, actualCalculationSettings.AnalysisType);
-            Assert.AreEqual(PersistableCalculationType.Deterministic, actualCalculationSettings.CalculationType);
-            Assert.AreEqual(slidingCurve.LeftCircle.Center.X, actualCalculationSettings.UpliftVan.SlipPlane.FirstCircleCenter.Value.X);
-            Assert.AreEqual(slidingCurve.LeftCircle.Center.Y, actualCalculationSettings.UpliftVan.SlipPlane.FirstCircleCenter.Value.Z);
-            Assert.AreEqual(slidingCurve.LeftCircle.Radius, actualCalculationSettings.UpliftVan.SlipPlane.FirstCircleRadius);
-            Assert.AreEqual(slidingCurve.RightCircle.Center.X, actualCalculationSettings.UpliftVan.SlipPlane.SecondCircleCenter.Value.X);
-            Assert.AreEqual(slidingCurve.RightCircle.Center.Y, actualCalculationSettings.UpliftVan.SlipPlane.SecondCircleCenter.Value.Z);
+            PersistableCalculationSettings extremeCalculationSettings = calculationSettings.Last();
+            Assert.IsNotNull(extremeCalculationSettings.Id);
+            Assert.AreEqual(PersistableAnalysisType.UpliftVan, extremeCalculationSettings.AnalysisType);
+            Assert.AreEqual(PersistableCalculationType.Deterministic, extremeCalculationSettings.CalculationType);
+            Assert.AreEqual(slidingCurve.LeftCircle.Center.X, extremeCalculationSettings.UpliftVan.SlipPlane.FirstCircleCenter.Value.X);
+            Assert.AreEqual(slidingCurve.LeftCircle.Center.Y, extremeCalculationSettings.UpliftVan.SlipPlane.FirstCircleCenter.Value.Z);
+            Assert.AreEqual(slidingCurve.LeftCircle.Radius, extremeCalculationSettings.UpliftVan.SlipPlane.FirstCircleRadius);
+            Assert.AreEqual(slidingCurve.RightCircle.Center.X, extremeCalculationSettings.UpliftVan.SlipPlane.SecondCircleCenter.Value.X);
+            Assert.AreEqual(slidingCurve.RightCircle.Center.Y, extremeCalculationSettings.UpliftVan.SlipPlane.SecondCircleCenter.Value.Z);
         }
 
         /// <summary>