Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs	(.../TimeSerieCollectionTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs	(.../TimeSerieCollectionTest.cs)	(revision 4625)
@@ -100,14 +100,14 @@
             Assert.IsTrue(timeSerie.ParameterId.Equals("Cat speed", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(timeSerie.LocationId.Equals("LOC-04", StringComparison.InvariantCultureIgnoreCase));
 
-            Assert.AreEqual(0, timeSerieCollection.Series.IndexOf(timeSerie));
+            Assert.That(timeSerieCollection.Series.IndexOf(timeSerie), Is.EqualTo(0));
 
             timeSerie = timeSerieCollection.FindSerie("Dog speed", "LOC-27");
 
             Assert.IsTrue(timeSerie.ParameterId.Equals("Dog speed", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(timeSerie.LocationId.Equals("LOC-27", StringComparison.InvariantCultureIgnoreCase));
 
-            Assert.AreEqual(3, timeSerieCollection.Series.IndexOf(timeSerie));
+            Assert.That(timeSerieCollection.Series.IndexOf(timeSerie), Is.EqualTo(3));
 
             timeSerie = timeSerieCollection.FindSerie("OvertoppingRate", "LOC-27");
             Assert.IsTrue(timeSerie.ParameterId.Equals("OvertoppingRate", StringComparison.InvariantCultureIgnoreCase));
@@ -118,26 +118,26 @@
         public void TestSeriesAtLocation()
         {
             IEnumerable<TimeSerie> serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-04");
-            Assert.AreEqual(2, serieCollection.Count());
+            Assert.That(serieCollection.Count(), Is.EqualTo(2));
 
             serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-27");
-            Assert.AreEqual(3, serieCollection.Count());
+            Assert.That(serieCollection.Count(), Is.EqualTo(3));
 
             serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-36");
-            Assert.AreEqual(0, serieCollection.Count());
+            Assert.That(serieCollection.Count(), Is.EqualTo(0));
         }
 
         [Test]
         public void TestSeriesOfParameter()
         {
             IEnumerable<TimeSerie> serieCollection = timeSerieCollection.GetSeriesByParameterId("Cat Speed");
-            Assert.AreEqual(3, serieCollection.Count());
+            Assert.That(serieCollection.Count(), Is.EqualTo(3));
 
             serieCollection = timeSerieCollection.GetSeriesByParameterId("Dog Speed");
-            Assert.AreEqual(2, serieCollection.Count());
+            Assert.That(serieCollection.Count(), Is.EqualTo(2));
 
             serieCollection = timeSerieCollection.GetSeriesByParameterId("Bird Speed");
-            Assert.AreEqual(0, serieCollection.Count());
+            Assert.That(serieCollection.Count(), Is.EqualTo(0));
         }
 
         [Test]
@@ -160,8 +160,8 @@
             timeSerie1.Entries.Add(timeSerieEntry2);
             collection.Series.Add(timeSerie1);
             collection.UpdateAllEntryValues("test", x => x + 1);
-            Assert.AreEqual(2, collection.Series[0].Entries[0].Value);
-            Assert.AreEqual(3, collection.Series[0].Entries[1].Value);
+            Assert.That(collection.Series[0].Entries[0].Value, Is.EqualTo(2));
+            Assert.That(collection.Series[0].Entries[1].Value, Is.EqualTo(3));
         }
 
         [Test]
@@ -194,11 +194,11 @@
             collection.Series.Add(timeSerie1);
             IEnumerable<TimeSerie> newCollection = collection.Map(locationId, parameterId,
                                                                   timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2)));
-            Assert.AreEqual(1, newCollection.Count());
+            Assert.That(newCollection.Count(), Is.EqualTo(1));
             TimeSerie newTimeSerie = newCollection.ElementAt(0);
-            Assert.AreEqual(2, newTimeSerie.Entries.Count);
-            Assert.AreEqual(2, newTimeSerie.Entries[0].Value);
-            Assert.AreEqual(4, newTimeSerie.Entries[1].Value);
+            Assert.That(newTimeSerie.Entries.Count, Is.EqualTo(2));
+            Assert.That(newTimeSerie.Entries[0].Value, Is.EqualTo(2));
+            Assert.That(newTimeSerie.Entries[1].Value, Is.EqualTo(4));
         }
 
         [Test]
@@ -231,10 +231,10 @@
             collection.Series.Add(timeSerie1);
             IEnumerable<TimeSerie> newCollection = collection.Map(locationId1, parameterId,
                                                                   timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2)));
-            Assert.AreEqual(1, newCollection.Count());
+            Assert.That(newCollection.Count(), Is.EqualTo(1));
             TimeSerie newTimeSerie = newCollection.ElementAt(0);
-            Assert.AreEqual(1, newTimeSerie.Entries.Count);
-            Assert.AreEqual(2, newTimeSerie.Entries[0].Value);
+            Assert.That(newTimeSerie.Entries.Count, Is.EqualTo(1));
+            Assert.That(newTimeSerie.Entries[0].Value, Is.EqualTo(2));
         }
     }
 }
\ No newline at end of file