Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r4670 -r4779
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 4670)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 4779)
@@ -627,7 +627,7 @@
             scenario.RiverLevel = null;
 
             // When Writing Xml, Then Raise Exception With Clear Message
-            string expectedMessage = "Location 'Location 1', scenario '1' has no river level" + Environment.NewLine + "Parameter name: RiverLevel";
+            string expectedMessage = "Location 'Location 1', scenario '1' has no river level (Parameter 'RiverLevel')";
             Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
         }
 
@@ -663,7 +663,7 @@
             damProjectData.WaterBoard = null;
 
             // When Writing Xml, Then Raise Exception With Clear Message in case of Stability Outside
-            string expectedMessage = "No dike defined in this project" + Environment.NewLine + "Parameter name: WaterBoard";
+            string expectedMessage = "No dike defined in this project (Parameter 'WaterBoard')";
             Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
         }
 
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs
===================================================================
diff -u -r4625 -r4779
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs	(.../CsvParserTest.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs	(.../CsvParserTest.cs)	(revision 4779)
@@ -65,7 +65,7 @@
     [Test]
     public void ThrowsArgumentExceptionSplitterIsNull()
     {
-        string expectedMessage = "The given pattern to split the data values of the CSV files is not valid" + Environment.NewLine + "Parameter name: splitter";
+        string expectedMessage = "The given pattern to split the data values of the CSV files is not valid (Parameter 'splitter')";
         Assert.That(() => CsvParser.ParseHeader("test;test", null), Throws.InstanceOf<CsvParserException>().With.Message.EqualTo(expectedMessage));
     }