Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 3875)
@@ -83,7 +83,6 @@
 
         [Test]
         [TestCase("location_12_2_1D1")] // Between "location_12" and "_2_1D1" there are 2 illegal characters (1F hex)
-        [ExpectedException(typeof(IdValidatorException), ExpectedMessage = "Location has an invalid name location_12_2_1D1")]
         public void GivenDataSetContainingIllegalCharactersWhenWritingXmlThenRaiseExceptionWithClearMessage(string id)
         {
             // Given DataSet Containing Illegal Characters
@@ -99,7 +98,7 @@
             // Then Raise Exception With Clear Message()
             input = DamXmlSerialization.LoadInputFromXmlString(xmlString);
             DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input);
-            CompareDamProjectData(actualDamProjectData, expectedDamProjectData);
+            Assert.That(() => CompareDamProjectData(actualDamProjectData, expectedDamProjectData), Throws.InstanceOf<IdValidatorException>().With.Message.EqualTo("Location has an invalid name location_12_2_1D1"));
 
         }