Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs
===================================================================
diff -u -r4625 -r4638
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs	(.../TimeSeriesAssemblerTest.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs	(.../TimeSeriesAssemblerTest.cs)	(revision 4638)
@@ -275,15 +275,15 @@
             Assert.That(Double.Parse(headerElement.Element(tns + TimeSeriesAssembler.XmlMissValElementName).Value,
                                          CultureInfo.InvariantCulture),
                             Is.EqualTo(109.17));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlLongNameElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlStationNameElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlUnitsElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlSourceOrganisationElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlSourceSystemElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlFileDescriptionElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlCreationDateElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlCreationTimeElementName));
-            Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlRegionElementName));
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlLongNameElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlStationNameElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlUnitsElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlSourceOrganisationElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlSourceSystemElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlFileDescriptionElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlCreationDateElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlCreationTimeElementName), Is.Null);
+            Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlRegionElementName), Is.Null);
 
             // Entries (1)
             entryElements = serieElements[1].Elements(tns + TimeSeriesAssembler.XmlEntryElementName).ToArray();
@@ -316,7 +316,7 @@
             Assert.That(entryElements[5].AttributeAs<int>(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(2));
 
             // Comment (1)
-            Assert.IsNull(serieElements[1].Element(tns + TimeSeriesAssembler.XMLCommentElementName));
+            Assert.That(serieElements[1].Element(tns + TimeSeriesAssembler.XMLCommentElementName), Is.Null);
         }
 
         [Test]
@@ -335,7 +335,7 @@
             // Do the thing: create TimeSeries from XML element
             TimeSerieCollection timeSerieCollection = assembler.CreateDomainObject(testDoc);
 
-            Assert.IsNotNull(timeSerieCollection);
+            Assert.That(timeSerieCollection, Is.Not.Null);
 
             // TimeSeries itself
             Assert.That(timeSerieCollection.Version, Is.EqualTo("1.2"), "Version");
@@ -357,14 +357,14 @@
             Assert.That(timeSerie.StartDateTime.ToString("yyyy-MM-dd HH:mm:ss"), Is.EqualTo("2009-06-17 08:00:00"));
             Assert.That(timeSerie.EndDateTime.ToString("yyyy-MM-dd HH:mm:ss"), Is.EqualTo("2009-06-18 08:00:00"));
             Assert.That(timeSerie.MissVal, Is.EqualTo(-999.0));
-            Assert.IsNull(timeSerie.LongName);
+            Assert.That(timeSerie.LongName, Is.Null);
             Assert.That(timeSerie.StationName, Is.EqualTo("point 1"));
             Assert.That(timeSerie.Units, Is.EqualTo("m"));
-            Assert.IsNull(timeSerie.SourceOrganisation);
-            Assert.IsNull(timeSerie.SourceSystem);
-            Assert.IsNull(timeSerie.FileDescription);
-            Assert.IsNull(timeSerie.CreationDateTime);
-            Assert.IsNull(timeSerie.Region);
+            Assert.That(timeSerie.SourceOrganisation, Is.Null);
+            Assert.That(timeSerie.SourceSystem, Is.Null);
+            Assert.That(timeSerie.FileDescription, Is.Null);
+            Assert.That(timeSerie.CreationDateTime, Is.Null);
+            Assert.That(timeSerie.Region, Is.Null);
 
             // Number of entries
             Assert.That(timeSerie.Entries.Count, Is.EqualTo(25), "Number of entries");
@@ -374,7 +374,7 @@
             Assert.That(timeSerie.Entries[0].Flag, Is.EqualTo(0));
 
             // Comment
-            Assert.IsNull(timeSerie.Comment);
+            Assert.That(timeSerie.Comment, Is.Null);
         }
     }
 }
\ No newline at end of file