Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3875)
@@ -129,9 +129,9 @@
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
                 Assert.AreEqual(PipingModelType.SellmeijerVnk, result.DamFailureMechanismeCalculation.PipingModelType);
-                Assert.IsNotNullOrEmpty(result.LocationName);
-                Assert.IsNotNullOrEmpty(result.ScenarioName);
-                Assert.IsNotNullOrEmpty(result.ProfileName);
+                Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
                 Assert.AreEqual(3.65, result.PipingDesignResults.SellmeijerVnkFactor, diff);
                 Assert.AreEqual(3.65, result.PipingDesignResults.SellmeijerVnkHcritical, diff);
 
@@ -293,43 +293,39 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer VNK")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Sellmeijer VNK"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Sellmeijer VNK")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("No input object defined for Sellmeijer VNK"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor Sellmeijer VNK")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenOutputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen uitvoer object gedefinieerd voor Sellmeijer VNK"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer VNK")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(null, new DamPipingSellmeijerVnkOutput(), null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(null, new DamPipingSellmeijerVnkOutput(), null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Sellmeijer VNK"));
         }
 
     }