Index: Core/Components/test/Core.Components.Charting.Test/Data/PointBasedChartDataTest.cs
===================================================================
diff -u -rc1bf2169d092308f74989d0a634a74bec94f1ec2 -reb0bc2532043f07ea0fcdb052c7431f3aae843ff
--- Core/Components/test/Core.Components.Charting.Test/Data/PointBasedChartDataTest.cs	(.../PointBasedChartDataTest.cs)	(revision c1bf2169d092308f74989d0a634a74bec94f1ec2)
+++ Core/Components/test/Core.Components.Charting.Test/Data/PointBasedChartDataTest.cs	(.../PointBasedChartDataTest.cs)	(revision eb0bc2532043f07ea0fcdb052c7431f3aae843ff)
@@ -38,7 +38,7 @@
             TestDelegate test = () => new TestPointBasedChartData(null, "test data");
             
             // Assert
-            var expectedMessage = "A point collection is required when creating a subclass of Core.Components.Charting.Data.PointBasedChartData.";
+            var expectedMessage = "A function for obtaining a point collection is required when creating a subclass of Core.Components.Charting.Data.PointBasedChartData.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, expectedMessage);
         }
 
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs
===================================================================
diff -u -r53b0705782fa4ece3696758254cec61787337fe6 -reb0bc2532043f07ea0fcdb052c7431f3aae843ff
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs	(.../ChartAreaDataConverterTest.cs)	(revision 53b0705782fa4ece3696758254cec61787337fe6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs	(.../ChartAreaDataConverterTest.cs)	(revision eb0bc2532043f07ea0fcdb052c7431f3aae843ff)
@@ -91,7 +91,7 @@
 
                 for (var i = 0; i < randomCount; i++)
                 {
-                    points.Add(new Point2D(random.NextDouble(), random.NextDouble()));
+                    points.Add(new Point2D(i, i));
                 }
 
                 return points;
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs
===================================================================
diff -u -r53b0705782fa4ece3696758254cec61787337fe6 -reb0bc2532043f07ea0fcdb052c7431f3aae843ff
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs	(.../ChartLineDataConverterTest.cs)	(revision 53b0705782fa4ece3696758254cec61787337fe6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs	(.../ChartLineDataConverterTest.cs)	(revision eb0bc2532043f07ea0fcdb052c7431f3aae843ff)
@@ -92,7 +92,7 @@
 
                 for (var i = 0; i < randomCount; i++)
                 {
-                    points.Add(new Point2D(random.NextDouble(), random.NextDouble()));
+                    points.Add(new Point2D(i, i));
                 }
 
                 return points;
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs
===================================================================
diff -u -r53b0705782fa4ece3696758254cec61787337fe6 -reb0bc2532043f07ea0fcdb052c7431f3aae843ff
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs	(.../ChartPointDataConverterTest.cs)	(revision 53b0705782fa4ece3696758254cec61787337fe6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs	(.../ChartPointDataConverterTest.cs)	(revision eb0bc2532043f07ea0fcdb052c7431f3aae843ff)
@@ -91,7 +91,7 @@
 
                 for (var i = 0; i < randomCount; i++)
                 {
-                    points.Add(new Point2D(random.NextDouble(), random.NextDouble()));
+                    points.Add(new Point2D(i, i));
                 }
 
                 return points;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs
===================================================================
diff -u -rfd3f53993a2113c76da7d305a0e80621605bfe3f -reb0bc2532043f07ea0fcdb052c7431f3aae843ff
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision fd3f53993a2113c76da7d305a0e80621605bfe3f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision eb0bc2532043f07ea0fcdb052c7431f3aae843ff)
@@ -186,20 +186,6 @@
         }
 
         [Test]
-        public void CreateDitchPolderSide_DitchPolderSideNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var surfaceLine = GetSurfaceLineWithGeometry();
-
-            // Call
-            TestDelegate call = () => PipingChartDataFactory.CreateDitchPolderSide(surfaceLine);
-
-            // Assert 
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("worldCoordinate", exception.ParamName);
-        }
-
-        [Test]
         public void CreateDitchPolderSide_GivenDitchPolderSide_ReturnsChartDataWithDefaultStyling()
         {
             // Setup
@@ -233,20 +219,6 @@
         }
 
         [Test]
-        public void CreateBottomDitchPolderSide_BottomDitchPolderSideNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var surfaceLine = GetSurfaceLineWithGeometry();
-
-            // Call
-            TestDelegate call = () => PipingChartDataFactory.CreateBottomDitchPolderSide(surfaceLine);
-
-            // Assert 
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("worldCoordinate", exception.ParamName);
-        }
-
-        [Test]
         public void CreateBottomDitchPolderSide_GivenBottomDitchPolderSide_ReturnsChartDataWithDefaultStyling()
         {
             // Setup
@@ -280,20 +252,6 @@
         }
 
         [Test]
-        public void CreateBottomDitchDikeSide_BottomDitchDikeSideNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var surfaceLine = GetSurfaceLineWithGeometry();
-
-            // Call
-            TestDelegate call = () => PipingChartDataFactory.CreateBottomDitchDikeSide(surfaceLine);
-
-            // Assert 
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("worldCoordinate", exception.ParamName);
-        }
-
-        [Test]
         public void CreateBottomDitchDikeSide_GivenBottomDitchDikeSide_ReturnsChartDataWithDefaultStyling()
         {
             // Setup
@@ -327,20 +285,6 @@
         }
 
         [Test]
-        public void CreateDitchDikeSide_DitchDikeSideNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var surfaceLine = GetSurfaceLineWithGeometry();
-
-            // Call
-            TestDelegate call = () => PipingChartDataFactory.CreateDitchDikeSide(surfaceLine);
-
-            // Assert 
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("worldCoordinate", exception.ParamName);
-        }
-
-        [Test]
         public void CreateDitchDikeSide_GivenDitchDikeSide_ReturnsChartDataWithDefaultStyling()
         {
             // Setup
@@ -374,20 +318,6 @@
         }
 
         [Test]
-        public void CreateDikeToeAtRiver_DikeToeAtRiverNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var surfaceLine = GetSurfaceLineWithGeometry();
-
-            // Call
-            TestDelegate call = () => PipingChartDataFactory.CreateDikeToeAtRiver(surfaceLine);
-
-            // Assert 
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("worldCoordinate", exception.ParamName);
-        }
-
-        [Test]
         public void CreateDikeToeAtRiver_GivenDikeToeAtRivere_ReturnsChartDataWithDefaultStyling()
         {
             // Setup
@@ -421,20 +351,6 @@
         }
 
         [Test]
-        public void CreateDikeToeAtPolder_DikeToeAtPolderNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var surfaceLine = GetSurfaceLineWithGeometry();
-
-            // Call
-            TestDelegate call = () => PipingChartDataFactory.CreateDikeToeAtPolder(surfaceLine);
-
-            // Assert 
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("worldCoordinate", exception.ParamName);
-        }
-
-        [Test]
         public void CreateDikeToeAtPolder_GivenDikeToeAtPolder_ReturnsChartDataWithDefaultStyling()
         {
             // Setup
@@ -597,7 +513,7 @@
                 new Point2D(2, top),
                 new Point2D(2, bottom),
                 new Point2D(0, bottom),
-                new Point2D(0, top),
+                new Point2D(0, top)
             }, soilLayerChartData.Areas.ElementAt(0));
         }
 
@@ -634,7 +550,7 @@
                 new Point2D(2, top),
                 new Point2D(2, bottom),
                 new Point2D(0, bottom),
-                new Point2D(0, top),
+                new Point2D(0, top)
             }, soilLayerChartData.Areas.ElementAt(0));
         }
 
@@ -668,7 +584,7 @@
                 new Point2D(1.5, top),
                 new Point2D(2, top),
                 new Point2D(2, bottom),
-                new Point2D(0, bottom),
+                new Point2D(0, bottom)
             }, soilLayerChartData.Areas.ElementAt(0));
         }
 
@@ -702,7 +618,7 @@
                 new Point2D(2, 2.0),
                 new Point2D(2, bottom),
                 new Point2D(0, bottom),
-                new Point2D(0, top),
+                new Point2D(0, top)
             }, soilLayerChartData.Areas.ElementAt(0));
         }