Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryObject.cs
===================================================================
diff -u -r5170 -r5193
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryObject.cs	(.../GeometryObject.cs)	(revision 5170)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryObject.cs	(.../GeometryObject.cs)	(revision 5193)
@@ -90,5 +90,5 @@
     /// <param name="originalValue"></param>
     /// <param name="accuracy"></param>
     /// <returns></returns>
-    public double RoundValue(double originalValue, double accuracy = GeometryConstants.Accuracy) => Math.Round(originalValue / accuracy) * accuracy;
+    public static double RoundValue(double originalValue, double accuracy = GeometryConstants.Accuracy) => Math.Round(originalValue / accuracy) * accuracy;
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryObjectTests.cs
===================================================================
diff -u -r5064 -r5193
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryObjectTests.cs	(.../GeometryObjectTests.cs)	(revision 5064)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryObjectTests.cs	(.../GeometryObjectTests.cs)	(revision 5193)
@@ -33,16 +33,17 @@
         var geometry = new GeometryObjectTestExerciser();
 
         // call
-        var returnedBounds = geometry.GetGeometryBounds();
+        GeometryBounds returnedBounds = geometry.GetGeometryBounds();
 
         // assert
         Assert.That(returnedBounds, Is.Null);
     }
 
     [Test]
-    [TestCase(null)]
-    [TestCase("hihi")]
-    public void Name_SetToEmptyString_NameNotChanged(string newName)
+    [TestCase(null, "haha")]
+    [TestCase("", "")]
+    [TestCase("hihi", "hihi")]
+    public void SetNameUnlessNewNameIsNull(string newName, string expectedName)
     {
         // setup
         var geometry = new GeometryObjectTestExerciser();
@@ -52,32 +53,10 @@
         geometry.Name = newName;
 
         // assert
-        if (newName == null)
-            Assert.That("haha".Equals(geometry.Name));
-        else
-            Assert.That(newName.Equals(geometry.Name));
+        Assert.That(geometry.Name, Is.EqualTo(expectedName));
     }
     
     [Test]
-    [TestCase(null)]
-    [TestCase("")]
-    [TestCase("haha")]
-    public void SetName_AnyValue_NameIsSet(string expectedName)
-    {
-        // setup
-        var geometry = new GeometryObjectTestExerciser();
-
-        // call
-        geometry.SetName(expectedName);
-
-        // assert
-        if (expectedName == null)
-            Assert.That(geometry.Name == null);
-        else
-            Assert.That(expectedName.Equals(geometry.Name));
-    }
-
-    [Test]
     [TestCase(0.0000455454, 0.000)]
     [TestCase(0.004455454, 0.004)]
     [TestCase(0.004555454, 0.005)]