Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs	(.../Geometry2DSectionAssemblerTest.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs	(.../Geometry2DSectionAssemblerTest.cs)	(revision 4624)
@@ -134,26 +134,26 @@
                                  select element).Single();
 
         // Database
-        Assert.AreEqual(geometry2DSectionParameters.SoilGeometry2DName, inputElement.AttributeAs<string>(Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), $"{Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename}");
-        Assert.AreEqual(geometry2DSectionParameters.XCoordinateSection, inputElement.AttributeAs<double>(Geometry2DSectionAssembler.XmlAttributeXCoordinateSection), $"{Geometry2DSectionAssembler.XmlAttributeXCoordinateSection}");
+        Assert.That(inputElement.AttributeAs<string>(Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename), Is.EqualTo(geometry2DSectionParameters.SoilGeometry2DName), $"{Geometry2DSectionAssembler.XmlAttributeSoilGeometry2DFilename}");
+        Assert.That(inputElement.AttributeAs<double>(Geometry2DSectionAssembler.XmlAttributeXCoordinateSection), Is.EqualTo(geometry2DSectionParameters.XCoordinateSection), $"{Geometry2DSectionAssembler.XmlAttributeXCoordinateSection}");
 
         // Profile
         IEnumerable<XElement> soilProfileCollectionElements = from element in doc.Root.Descendants()
                                                               where element.Name.LocalName == XMLAttributes.XmlElementProfile
                                                               select element;
 
-        Assert.AreEqual(1, soilProfileCollectionElements.Count(), "Number of profiles");
+        Assert.That(soilProfileCollectionElements.Count(), Is.EqualTo(1), "Number of profiles");
 
         XElement soilProfileElement = soilProfileCollectionElements.Single();
 
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeName), $"{XMLAttributes.XmlAttributeName}");
-        Assert.AreEqual(geometry2DSectionParameters.SoilProfile.Name, soilProfileElement.AttributeAs<string>(XMLAttributes.XmlAttributeName), $"{XMLAttributes.XmlAttributeName}");
+        Assert.That(soilProfileElement.AttributeAs<string>(XMLAttributes.XmlAttributeName), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Name), $"{XMLAttributes.XmlAttributeName}");
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeXCoordinate), $"{XMLAttributes.XmlAttributeXCoordinate}");
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeYCoordinate), $"{XMLAttributes.XmlAttributeYCoordinate}");
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributePhreaticLevel), $"{XMLAttributes.XmlAttributePhreaticLevel}");
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeHasPhreaticLevel), $"{XMLAttributes.XmlAttributeHasPhreaticLevel}");
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomLevel), $"{XMLAttributes.XmlAttributeBottomLevel}");
-        Assert.AreEqual(geometry2DSectionParameters.SoilProfile.BottomLevel, soilProfileElement.AttributeAs<double>(XMLAttributes.XmlAttributeBottomLevel), cTolerance, $"{XMLAttributes.XmlAttributeBottomLevel}");
+        Assert.That(soilProfileElement.AttributeAs<double>(XMLAttributes.XmlAttributeBottomLevel), Is.EqualTo(geometry2DSectionParameters.SoilProfile.BottomLevel).Within(cTolerance), $"{XMLAttributes.XmlAttributeBottomLevel}");
         // Created no PL line so characteristic layers are unassigned
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomSandLayerID), XMLAttributes.XmlAttributeBottomSandLayerID);
         Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInBetweenSandLayerID), XMLAttributes.XmlAttributeInBetweenSandLayerID);
@@ -164,25 +164,25 @@
                                                          where element.Name.LocalName == XMLAttributes.XmlElementLayers
                                                          select element;
 
-        Assert.AreEqual(1, layersCollectionElements.Count(), "profile layer collection tag");
+        Assert.That(layersCollectionElements.Count(), Is.EqualTo(1), "profile layer collection tag");
 
         IEnumerable<XElement> layerCollectionElements = from element in layersCollectionElements.Descendants()
                                                         where element.Name.LocalName == XMLAttributes.XmlElementLayer
                                                         select element;
 
-        Assert.AreEqual(geometry2DSectionParameters.SoilProfile.Layers.Count, layerCollectionElements.Count(), "Number of profile layers");
+        Assert.That(layerCollectionElements.Count(), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Layers.Count), "Number of profile layers");
 
         IEnumerator<XElement> layerElementEnumerator = layerCollectionElements.GetEnumerator();
         foreach (SoilLayer1D layer in geometry2DSectionParameters.SoilProfile.Layers)
         {
             layerElementEnumerator.MoveNext();
             XElement layerElement = layerElementEnumerator.Current;
             Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeID), $"{$"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}");
-            Assert.AreEqual(layer.Name, layerElement.AttributeAs<string>(XMLAttributes.XmlAttributeID), $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}");
+            Assert.That(layerElement.AttributeAs<string>(XMLAttributes.XmlAttributeID), Is.EqualTo(layer.Name), $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}");
             Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeSoilID), $"{$"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}");
-            Assert.AreEqual(layer.Soil.Name, layerElement.AttributeAs<string>(XMLAttributes.XmlAttributeSoilID), $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}");
+            Assert.That(layerElement.AttributeAs<string>(XMLAttributes.XmlAttributeSoilID), Is.EqualTo(layer.Soil.Name), $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}");
             Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeTopLevel), $"{$"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}");
-            Assert.AreEqual(layer.TopLevel, layerElement.AttributeAs<double>(XMLAttributes.XmlAttributeTopLevel), $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}");
+            Assert.That(layerElement.AttributeAs<double>(XMLAttributes.XmlAttributeTopLevel), Is.EqualTo(layer.TopLevel), $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}");
         }
     }
 
@@ -191,11 +191,11 @@
     {
         XDocument doc = XDocument.Load(outputXml);
         Geometry2DSectionParameters geometry2DSectionParameters = assembler.CreateOutputObject(doc);
-        Assert.AreEqual(6, geometry2DSectionParameters.SoilProfile.Layers.Count);
-        Assert.AreEqual(-10, geometry2DSectionParameters.SoilProfile.BottomLevel, cTolerance);
+        Assert.That(geometry2DSectionParameters.SoilProfile.Layers.Count, Is.EqualTo(6));
+        Assert.That(geometry2DSectionParameters.SoilProfile.BottomLevel, Is.EqualTo(-10).Within(cTolerance));
         Assert.IsTrue(geometry2DSectionParameters.SoilProfile.Layers[3].SoilName.Equals("DKN3"));
-        Assert.AreEqual(-2.8, geometry2DSectionParameters.SoilProfile.Layers[3].TopLevel, cTolerance);
+        Assert.That(geometry2DSectionParameters.SoilProfile.Layers[3].TopLevel, Is.EqualTo(-2.8).Within(cTolerance));
         Assert.IsTrue(geometry2DSectionParameters.SoilGeometry2DName.Equals("1D1.sti"));
-        Assert.AreEqual(64.0, geometry2DSectionParameters.XCoordinateSection, cTolerance);
+        Assert.That(geometry2DSectionParameters.XCoordinateSection, Is.EqualTo(64.0).Within(cTolerance));
     }
 }
\ No newline at end of file