Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvParserTest.cs
===================================================================
diff -u -r875 -r2645
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvParserTest.cs	(.../branches/CalcualtionIncluded/src/Dam/Tests/CsvParserTest.cs)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvParserTest.cs	(.../trunk/src/Dam/Tests/CsvParserTest.cs)	(revision 2645)
@@ -1,3 +1,24 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -27,24 +48,24 @@
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentException))]
         public void ThrowsArgumentExceptionWhenHeaderStringIsNullByCallingParseHeader()
         {
-            CsvParser.ParseHeader(null, null);
+            var expectedMessage = "The header in the import file is not valid";
+            Assert.That(() => CsvParser.ParseHeader(null, new Regex("")), Throws.TypeOf(typeof(ArgumentException)).With.Message.EqualTo(expectedMessage));
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
         public void ThrowsArgumentExceptionSplitterIsNull()
         {
-            CsvParser.ParseHeader("test;test", null);
+            var expectedMessage = "The given pattern to split the data values of the CSV files is not valid" + Environment.NewLine + "Parameter name: splitter";
+            Assert.That(() => CsvParser.ParseHeader("test;test", null), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentException))]
         public void ThrowsWhenSplitPatternIsEmpty()
         {
-            CsvParser.ParseHeader("test", new Regex(""));
+            var expectedMessage = "The given pattern to split the data values of the CSV files is not valid";
+            Assert.That(() => CsvParser.ParseHeader("test", new Regex("")), Throws.TypeOf(typeof(ArgumentException)).With.Message.EqualTo(expectedMessage));
         }
 
         //[Test]