Index: Core/Components/src/Core.Components.Charting/Data/AreaData.cs
===================================================================
diff -u -rdaaa148db691a71c042fcdd3ca039cf13c59217c -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/src/Core.Components.Charting/Data/AreaData.cs	(.../AreaData.cs)	(revision daaa148db691a71c042fcdd3ca039cf13c59217c)
+++ Core/Components/src/Core.Components.Charting/Data/AreaData.cs	(.../AreaData.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -12,8 +12,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="AreaData"/>.
         /// </summary>
-        /// <param name="points">A <see cref="Collection{T}"/> of <see cref="Tuple{T1,T2}"/> which
-        /// forms a closed area in 2D space.</param>
+        /// <param name="points">A <see cref="Collection{T}"/> of <see cref="Tuple{T1,T2}"/> as (X,Y) points.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="points"/> is <c>null</c>.</exception>
         public AreaData(IEnumerable<Tuple<double, double>> points) : base(points)
         {
Index: Core/Components/src/Core.Components.Charting/Data/ChartData.cs
===================================================================
diff -u -rdaaa148db691a71c042fcdd3ca039cf13c59217c -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/src/Core.Components.Charting/Data/ChartData.cs	(.../ChartData.cs)	(revision daaa148db691a71c042fcdd3ca039cf13c59217c)
+++ Core/Components/src/Core.Components.Charting/Data/ChartData.cs	(.../ChartData.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -12,8 +12,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="ChartData"/>.
         /// </summary>
-        /// <param name="points">An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1,T2}"/> of the 
-        /// <see cref="ChartData"/> in 2D space.</param>
+        /// <param name="points">An <see cref="IEnumerable{T}"/> of <see cref="Tuple{T1,T2}"/> as (x,y) points.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="points"/> is <c>null</c>.</exception>
         protected ChartData(IEnumerable<Tuple<double, double>> points)
         {
Index: Core/Components/src/Core.Components.Charting/Data/LineData.cs
===================================================================
diff -u -rdaaa148db691a71c042fcdd3ca039cf13c59217c -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/src/Core.Components.Charting/Data/LineData.cs	(.../LineData.cs)	(revision daaa148db691a71c042fcdd3ca039cf13c59217c)
+++ Core/Components/src/Core.Components.Charting/Data/LineData.cs	(.../LineData.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -12,8 +12,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="LineData"/>.
         /// </summary>
-        /// <param name="points">A <see cref="Collection{T}"/> of <see cref="Tuple{T1,T2}"/> which forms a line
-        /// in 2D space.</param>
+        /// <param name="points">A <see cref="Collection{T}"/> of <see cref="Tuple{T1,T2}"/> as (X,Y) points.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="points"/> is <c>null</c>.</exception>
         public LineData(IEnumerable<Tuple<double, double>> points) : base(points)
         {
Index: Core/Components/src/Core.Components.Charting/Data/PointData.cs
===================================================================
diff -u -rdaaa148db691a71c042fcdd3ca039cf13c59217c -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/src/Core.Components.Charting/Data/PointData.cs	(.../PointData.cs)	(revision daaa148db691a71c042fcdd3ca039cf13c59217c)
+++ Core/Components/src/Core.Components.Charting/Data/PointData.cs	(.../PointData.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -12,8 +12,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="PointData"/>.
         /// </summary>
-        /// <param name="points">A <see cref="Collection{T}"/> of <see cref="Tuple{T1,T2}"/> which is visible
-        /// as points in 2D space.</param>
+        /// <param name="points">A <see cref="Collection{T}"/> of <see cref="Tuple{T1,T2}"/> as (X,Y) points.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="points"/> is <c>null</c>.</exception>
         public PointData(IEnumerable<Tuple<double, double>> points) : base(points)
         {
Index: Core/Components/src/Core.Components.OxyPlot.Forms/BaseChart.cs
===================================================================
diff -u -rc0c01906c23d8951360f8c299473e1eb92729451 -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/src/Core.Components.OxyPlot.Forms/BaseChart.cs	(.../BaseChart.cs)	(revision c0c01906c23d8951360f8c299473e1eb92729451)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/BaseChart.cs	(.../BaseChart.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -137,7 +137,7 @@
                 MinorGridlineStyle = LineStyle.Dot
             };
         }
-        
+
         /// <summary>
         /// Updates the tree with the currently known <see cref="Data"/>.
         /// </summary>
Index: Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj
===================================================================
diff -u -rce6b88b227d337f33b2566122b8624f9a74a3711 -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj	(.../Core.Components.Charting.Test.csproj)	(revision ce6b88b227d337f33b2566122b8624f9a74a3711)
+++ Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj	(.../Core.Components.Charting.Test.csproj)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -52,6 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Data\AreaDataTest.cs" />
+    <Compile Include="Data\ChartDataTest.cs" />
     <Compile Include="Data\LineDataTest.cs" />
     <Compile Include="Data\PointDataTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -64,6 +65,10 @@
       <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
       <Name>Core.Components.Charting</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Core.Components.Charting.TestUtil\Core.Components.Charting.TestUtil.csproj">
+      <Project>{E900A014-CA87-4374-87F0-813D653A9698}</Project>
+      <Name>Core.Components.Charting.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Core/Components/test/Core.Components.Charting.Test/Data/AreaDataTest.cs
===================================================================
diff -u -rce6b88b227d337f33b2566122b8624f9a74a3711 -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Components/test/Core.Components.Charting.Test/Data/AreaDataTest.cs	(.../AreaDataTest.cs)	(revision ce6b88b227d337f33b2566122b8624f9a74a3711)
+++ Core/Components/test/Core.Components.Charting.Test/Data/AreaDataTest.cs	(.../AreaDataTest.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Core.Components.Charting.Data;
 using NUnit.Framework;
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartDataTest.cs	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using Core.Components.Charting.Data;
+using NUnit.Framework;
+
+namespace Core.Components.Charting.Test.Data
+{
+    [TestFixture]
+    public class ChartDataTest
+    {
+        [Test]
+        public void Constructor_PointsNull_ThrowsArgumentException()
+        {
+            // Call
+            TestDelegate test = () => new TestChartData(null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        } 
+
+        [Test]
+        public void Constructor_WithPoints_PointsCopySet()
+        {
+            // Setup
+            var points = new List<Tuple<double, double>>
+            {
+                new Tuple<double, double>(3.2, 1.1)
+            };
+
+            // Call
+            var data = new TestChartData(points);
+
+            // Assert
+            Assert.IsTrue(data.IsVisible);
+            CollectionAssert.AreEqual(points, data.Points);
+            Assert.AreNotSame(points, data.Points);
+        } 
+    }
+
+    public class TestChartData : ChartData {
+        public TestChartData(IEnumerable<Tuple<double, double>> points) : base(points) {}
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs
===================================================================
diff -u -rdaaa148db691a71c042fcdd3ca039cf13c59217c -race2d2aedcb70dbf614869b58145aec35d233c08
--- Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision daaa148db691a71c042fcdd3ca039cf13c59217c)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision ace2d2aedcb70dbf614869b58145aec35d233c08)
@@ -45,6 +45,15 @@
             };
         }
 
+        public override void Dispose()
+        {
+            if (activated)
+            {
+                Gui.ActiveViewChanged -= GuiOnActiveViewChanged;
+            }
+            base.Dispose();
+        }
+
         public bool IsToolWindowOpen<T>()
         {
             return Gui.ToolWindowViews.Any(t => t.GetType() == typeof(T));
@@ -61,15 +70,6 @@
             Gui.CloseToolView(toolView);
         }
 
-        public override void Dispose()
-        {
-            if (activated)
-            {
-                Gui.ActiveViewChanged -= GuiOnActiveViewChanged;
-            }
-            base.Dispose();
-        }
-
         /// <summary>
         /// Creates a new <see cref="LegendController"/>.
         /// </summary>