Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs	(.../LocationTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs	(.../LocationTest.cs)	(revision 4625)
@@ -46,8 +46,8 @@
                     actualLocation.SetParameterFromNameValuePair(soilDetail.Key, soilDetail.Value);
                 }
 
-                Assert.AreEqual(expectedLocation.DampingFactorPL3, actualLocation.DampingFactorPL3,
-                                cTolerance);
+                Assert.That(actualLocation.DampingFactorPL3,
+                                Is.EqualTo(expectedLocation.DampingFactorPL3).Within(cTolerance));
             }
         }
 
@@ -67,15 +67,15 @@
             var actualLocation = new Location();
 
             // assert
-            Assert.AreEqual(areLocalXzObjectsCreated, actualLocation.AreLocalXZObjectsCreated);
-            Assert.AreEqual(penetrationLength, actualLocation.PenetrationLength);
-            Assert.AreEqual(trafficLoad, actualLocation.TrafficLoad);
-            Assert.AreEqual(null, actualLocation.TL_DegreeOfConsolidation);
-            Assert.AreEqual(plLineCreationMethod, actualLocation.PLLineCreationMethod);
-            Assert.AreEqual(IntrusionVerticalWaterPressureType.Standard, actualLocation.IntrusionVerticalWaterPressure);
-            Assert.AreEqual(stabilityShoulderGrowSlope, actualLocation.StabilityShoulderGrowSlope, 1e-12);
-            Assert.AreEqual(stabilityShoulderGrowDeltaX, actualLocation.StabilityShoulderGrowDeltaX);
-            Assert.AreEqual(stabilitySlopeAdaptionDeltaX, actualLocation.StabilitySlopeAdaptionDeltaX);
+            Assert.That(actualLocation.AreLocalXZObjectsCreated, Is.EqualTo(areLocalXzObjectsCreated));
+            Assert.That(actualLocation.PenetrationLength, Is.EqualTo(penetrationLength));
+            Assert.That(actualLocation.TrafficLoad, Is.EqualTo(trafficLoad));
+            Assert.That(actualLocation.TL_DegreeOfConsolidation, Is.EqualTo(null));
+            Assert.That(actualLocation.PLLineCreationMethod, Is.EqualTo(plLineCreationMethod));
+            Assert.That(actualLocation.IntrusionVerticalWaterPressure, Is.EqualTo(IntrusionVerticalWaterPressureType.Standard));
+            Assert.That(actualLocation.StabilityShoulderGrowSlope, Is.EqualTo(stabilityShoulderGrowSlope).Within(1e-12));
+            Assert.That(actualLocation.StabilityShoulderGrowDeltaX, Is.EqualTo(stabilityShoulderGrowDeltaX));
+            Assert.That(actualLocation.StabilitySlopeAdaptionDeltaX, Is.EqualTo(stabilitySlopeAdaptionDeltaX));
         }
     }
 }
\ No newline at end of file