Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r3664 -r3825
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3664)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3825)
@@ -234,10 +234,9 @@
         }
 
         [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)]
-        [ExpectedException(typeof(ConversionException), ExpectedMessage = "Couldn't convert '0' to type FailureMechanismSystemType")]
         public void CannotConvertToSegmentFailureMechanismType(int inputFailureMechanismSystemType)
         {
-            ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType);
+            Assert.That(() => ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType), Throws.InstanceOf<ConversionException>().With.Message.EqualTo("Couldn't convert '0' to type FailureMechanismSystemType"));
         }
 
         [Test]