Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r669 -r711
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 669)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 711)
@@ -215,7 +215,41 @@
         [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)]
         public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
         {
-            Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
+            Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType));
         }
+
+        [Test]
+        [TestCase(InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry)]
+        [TestCase(InputAnalysisType.NoAdaption, AnalysisType.NoAdaption)]
+        public void CanConvertToInputAnalysisType(AnalysisType analysisType, InputAnalysisType inputAnalysisType)
+        {
+            Assert.AreEqual(inputAnalysisType, ConversionHelper.ConvertToInputAnalysisType(analysisType));
+        }
+
+        [Test]
+        [TestCase(AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry)]
+        [TestCase(AnalysisType.NoAdaption, InputAnalysisType.NoAdaption)]
+        public void CanConvertToAnalysisType(InputAnalysisType inputAnalysisType, AnalysisType analysisType)
+        {
+            Assert.AreEqual(analysisType, ConversionHelper.ConvertToAnalysisType(inputAnalysisType));
+        }
+
+        [Test]
+        [TestCase(MStabZonesType.NoZones, ConversionHelper.InputZoneTypeNoZones)]
+        [TestCase(MStabZonesType.ZoneAreas, ConversionHelper.InputZoneTypeZoneAreas)]
+        [TestCase(MStabZonesType.ForbiddenZone, ConversionHelper.InputZoneTypesForbiddenZones)]
+        public void CanConvertToInputZoneType(MStabZonesType zoneType, int inputZoneType)
+        {
+            Assert.AreEqual(inputZoneType, ConversionHelper.ConvertToInputZoneType(zoneType));
+        }
+
+        [Test]
+        [TestCase(ConversionHelper.InputZoneTypeNoZones, MStabZonesType.NoZones)]
+        [TestCase(ConversionHelper.InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas)]
+        [TestCase(ConversionHelper.InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone)]
+        public void CanConvertToZoneType(int inputZoneType, MStabZonesType zoneType)
+        {
+            Assert.AreEqual(zoneType, ConversionHelper.ConvertToZoneType(inputZoneType));
+        }
     }
 }