Index: Core/Common/test/Core.Common.Base.TestUtil.Test/Geometry/Point2DComparerWithToleranceTest.cs
===================================================================
diff -u -rd0349fb5dd123ec8e6b7a5b6b3b099ebaa684511 -r230aa8c10b17501534d4b5b8d1242d51155867c0
--- Core/Common/test/Core.Common.Base.TestUtil.Test/Geometry/Point2DComparerWithToleranceTest.cs	(.../Point2DComparerWithToleranceTest.cs)	(revision d0349fb5dd123ec8e6b7a5b6b3b099ebaa684511)
+++ Core/Common/test/Core.Common.Base.TestUtil.Test/Geometry/Point2DComparerWithToleranceTest.cs	(.../Point2DComparerWithToleranceTest.cs)	(revision 230aa8c10b17501534d4b5b8d1242d51155867c0)
@@ -34,8 +34,6 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
-            // Setup
-
             // Call
             var comparer = new Point2DComparerWithTolerance(1.1);
 
@@ -51,14 +49,14 @@
             var firstObject = new object();
             object secondObject = 1.1;
 
-            var comparer = new Point2DComparerWithTolerance(2.2);
+            var comparer = new Point2DComparerWithTolerance(0);
 
             // Call
-            TestDelegate call = () => comparer.Compare(firstObject, secondObject);
+            void Call() => comparer.Compare(firstObject, secondObject);
 
             // Assert
-            string message = Assert.Throws<ArgumentException>(call).Message;
-            Assert.AreEqual($"Cannot compare objects other than {typeof(Point2D)} with this comparer.", message);
+            var exception = Assert.Throws<ArgumentException>(Call);
+            Assert.AreEqual($"Cannot compare objects other than {typeof(Point2D)} with this comparer.", exception.Message);
         }
 
         [Test]
@@ -68,14 +66,14 @@
             object firstObject = 2.2;
             var secondObject = new object();
 
-            var comparer = new Point2DComparerWithTolerance(2.2);
+            var comparer = new Point2DComparerWithTolerance(0);
 
             // Call
-            TestDelegate call = () => comparer.Compare(firstObject, secondObject);
+            void Call() => comparer.Compare(firstObject, secondObject);
 
             // Assert
-            string message = Assert.Throws<ArgumentException>(call).Message;
-            Assert.AreEqual($"Cannot compare objects other than {typeof(Point2D)} with this comparer.", message);
+            var exception = Assert.Throws<ArgumentException>(Call);
+            Assert.AreEqual($"Cannot compare objects other than {typeof(Point2D)} with this comparer.", exception.Message);
         }
 
         [Test]
Index: Core/Common/test/Core.Common.TestUtil.Test/DoubleWithToleranceComparerTest.cs
===================================================================
diff -u -rd0349fb5dd123ec8e6b7a5b6b3b099ebaa684511 -r230aa8c10b17501534d4b5b8d1242d51155867c0
--- Core/Common/test/Core.Common.TestUtil.Test/DoubleWithToleranceComparerTest.cs	(.../DoubleWithToleranceComparerTest.cs)	(revision d0349fb5dd123ec8e6b7a5b6b3b099ebaa684511)
+++ Core/Common/test/Core.Common.TestUtil.Test/DoubleWithToleranceComparerTest.cs	(.../DoubleWithToleranceComparerTest.cs)	(revision 230aa8c10b17501534d4b5b8d1242d51155867c0)
@@ -32,8 +32,6 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
-            // Setup
-
             // Call
             var comparer = new DoubleWithToleranceComparer(1.1);
 
@@ -49,14 +47,14 @@
             var firstObject = new object();
             object secondObject = 1.1;
 
-            var comparer = new DoubleWithToleranceComparer(2.2);
+            var comparer = new DoubleWithToleranceComparer(0);
 
             // Call
-            TestDelegate call = () => comparer.Compare(firstObject, secondObject);
+            void Call() => comparer.Compare(firstObject, secondObject);
 
             // Assert
-            string message = Assert.Throws<ArgumentException>(call).Message;
-            Assert.AreEqual($"Cannot compare objects other than {typeof(double)} with this comparer.", message);
+            var exception = Assert.Throws<ArgumentException>(Call);
+            Assert.AreEqual($"Cannot compare objects other than {typeof(double)} with this comparer.", exception.Message);
         }
 
         [Test]
@@ -66,14 +64,14 @@
             object firstObject = 2.2;
             var secondObject = new object();
 
-            var comparer = new DoubleWithToleranceComparer(2.2);
+            var comparer = new DoubleWithToleranceComparer(0);
 
             // Call
-            TestDelegate call = () => comparer.Compare(firstObject, secondObject);
+            void Call() => comparer.Compare(firstObject, secondObject);
 
             // Assert
-            string message = Assert.Throws<ArgumentException>(call).Message;
-            Assert.AreEqual($"Cannot compare objects other than {typeof(double)} with this comparer.", message);
+            var exception = Assert.Throws<ArgumentException>(Call);
+            Assert.AreEqual($"Cannot compare objects other than {typeof(double)} with this comparer.", exception.Message);
         }
 
         [Test]