Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ScenarioTest.cs
===================================================================
diff -u -r4625 -r4638
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ScenarioTest.cs	(.../ScenarioTest.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ScenarioTest.cs	(.../ScenarioTest.cs)	(revision 4638)
@@ -39,11 +39,11 @@
             var scenario = new Scenario();
 
             // Assert
-            Assert.IsInstanceOf<IVisibleEnabled>(scenario);
-            Assert.IsInstanceOf<IRepairer>(scenario);
+            Assert.That(scenario, Is.InstanceOf<IVisibleEnabled>());
+            Assert.That(scenario, Is.InstanceOf<IRepairer>());
 
             Assert.That(scenario.PolderLevel, Is.EqualTo(0));
-            Assert.IsNull(scenario.HeadPl2);
+            Assert.That(scenario.HeadPl2, Is.Null);
         }
 
         [Test]
@@ -61,7 +61,7 @@
 
             // Then
             const string variableName = "PolderLevel";
-            Assert.IsTrue(pairs.ContainsKey(variableName));
+            Assert.That(pairs.ContainsKey(variableName), Is.True);
             string pairValue = pairs[variableName];
             var expectedValue = scenario.PolderLevel.ToString(new NumberFormatInfo
             {
@@ -103,14 +103,14 @@
             };
 
             // Precondition
-            Assert.IsNotNull(scenario.HeadPl2);
+            Assert.That(scenario.HeadPl2, Is.Not.Null);
 
             // When
             Dictionary<string, string> pairs = scenario.GetParametersAsNameValuePairs();
 
             // Then
             const string variableName = "HeadPL2";
-            Assert.IsTrue(pairs.ContainsKey(variableName));
+            Assert.That(pairs.ContainsKey(variableName), Is.True);
             string pairValue = pairs[variableName];
             var expectedValue = scenario.HeadPl2.Value.ToString(new NumberFormatInfo
             {
@@ -126,13 +126,13 @@
             var scenario = new Scenario();
 
             // Precondition
-            Assert.IsNull(scenario.HeadPl2);
+            Assert.That(scenario.HeadPl2, Is.Null);
 
             // When
             Dictionary<string, string> pairs = scenario.GetParametersAsNameValuePairs();
 
             // Then
-            Assert.IsFalse(pairs.ContainsKey("HeadPl2"));
+            Assert.That(pairs.ContainsKey("HeadPl2"), Is.False);
         }
 
         [Test]
@@ -151,7 +151,7 @@
             var scenario = new Scenario();
 
             // Precondition
-            Assert.IsNull(scenario.HeadPl2);
+            Assert.That(scenario.HeadPl2, Is.Null);
 
             // Call
             scenario.SetParameterFromNameValuePair(headPL2Name, stringValue);