Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs	(.../MultipleAreaSeries.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs	(.../MultipleAreaSeries.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -28,11 +28,13 @@
 namespace Core.Components.OxyPlot.CustomSeries
 {
     /// <summary>
-    /// Represents multiple area series that fills the polygons defined by each collection of points.
+    /// Represents multiple area series that fills each of the polygons defined by a collection of points.
     /// </summary>
     public class MultipleAreaSeries : XYAxisSeries
     {
         private readonly OxyColor defaultColor = OxyColors.Fuchsia;
+        private OxyColor color;
+        private OxyColor fill;
 
         /// <summary>
         /// Creates a new instance of <see cref="MultipleAreaSeries"/>.
@@ -50,18 +52,16 @@
         /// Gets or sets the color of the curve.
         /// </summary>
         /// <value>The color.</value>
-        public OxyColor Color { get; set; }
-
-        /// <summary>
-        /// Gets the actual color.
-        /// </summary>
-        /// <value>The actual color.</value>
-        public OxyColor ActualColor
+        public OxyColor Color
         {
             get
             {
-                return Color.GetActualColor(defaultColor);
+                return color.GetActualColor(defaultColor);
             }
+            set
+            {
+                color = value;
+            }
         }
 
         /// <summary>
@@ -74,18 +74,16 @@
         /// Gets or sets the area fill color.
         /// </summary>
         /// <value>The fill.</value>
-        public OxyColor Fill { get; set; }
-
-        /// <summary>
-        /// Gets the actual fill color.
-        /// </summary>
-        /// <value>The actual fill.</value>
-        public OxyColor ActualFill
+        public OxyColor Fill
         {
             get
             {
-                return Fill.GetActualColor(defaultColor);
+                return fill.GetActualColor(defaultColor);
             }
+            set
+            {
+                fill = value;
+            }
         }
 
         public override void Render(IRenderContext renderContext)
@@ -94,31 +92,25 @@
             {
                 throw new ArgumentNullException(nameof(renderContext));
             }
-
-            IList<DataPoint[]> areas = Areas;
-            int numberOfAreas = areas.Count;
-            if (numberOfAreas == 0)
+            
+            if (!Areas.Any() || Areas.All(a => !a.Any()))
             {
                 return;
             }
-            if (areas.All(a => !a.Any()))
-            {
-                return;
-            }
 
             VerifyAxes();
 
             OxyRect clippingRect = GetClippingRect();
             renderContext.SetClip(clippingRect);
 
             // Transform all points to screen coordinates
-            foreach (DataPoint[] area in areas)
+            foreach (DataPoint[] area in Areas)
             {
                 int n0 = area.Length;
                 IList<ScreenPoint> pts0 = new ScreenPoint[n0];
                 TransformToScreenCoordinates(n0, pts0, area);
 
-                renderContext.DrawClippedPolygon(clippingRect, pts0, 1, GetSelectableFillColor(ActualFill), ActualColor, StrokeThickness);
+                renderContext.DrawClippedPolygon(clippingRect, pts0, 1, GetSelectableFillColor(Fill), Color, StrokeThickness);
             }
 
             renderContext.ResetClip();
Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs
===================================================================
diff -u -rfa07631b4d1fac0c9d34aedfc19de6afc1e01f59 -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs	(.../MultipleLineSeries.cs)	(revision fa07631b4d1fac0c9d34aedfc19de6afc1e01f59)
+++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs	(.../MultipleLineSeries.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -28,11 +28,12 @@
 namespace Core.Components.OxyPlot.CustomSeries
 {
     /// <summary>
-    /// Represents multiple line series that are defined by each collection of points.
+    /// Represents multiple line series that are each defined by a collection of points.
     /// </summary>
     public class MultipleLineSeries : XYAxisSeries
     {
         private readonly OxyColor defaultColor = OxyColors.Fuchsia;
+        private OxyColor color;
 
         /// <summary>
         /// Creates a new instance of <see cref="MultipleLineSeries"/>.
@@ -56,17 +57,16 @@
         /// <summary>
         /// Gets or sets the color of the lines.
         /// </summary>
-        public OxyColor Color { get; set; }
-
-        /// <summary>
-        /// Gets the actual color.
-        /// </summary>
-        public OxyColor ActualColor
+        public OxyColor Color
         {
             get
             {
-                return Color.GetActualColor(defaultColor);
+                return color.GetActualColor(defaultColor);
             }
+            set
+            {
+                color = value;
+            }
         }
 
         /// <summary>
@@ -81,8 +81,7 @@
                 throw new ArgumentNullException(nameof(renderContext));
             }
 
-            IList<DataPoint[]> lines = Lines;
-            if (!lines.Any() || lines.All(a => !a.Any()))
+            if (!Lines.Any() || Lines.All(a => !a.Any()))
             {
                 return;
             }
@@ -93,13 +92,13 @@
             renderContext.SetClip(clippingRect);
 
             // Transform all points to screen coordinates
-            foreach (DataPoint[] area in lines)
+            foreach (DataPoint[] line in Lines)
             {
-                int n0 = area.Length;
+                int n0 = line.Length;
                 IList<ScreenPoint> pts0 = new ScreenPoint[n0];
-                TransformToScreenCoordinates(n0, pts0, area);
+                TransformToScreenCoordinates(n0, pts0, line);
 
-                renderContext.DrawLine(pts0, ActualColor, StrokeThickness, LineStyle.GetDashArray());
+                renderContext.DrawLine(pts0, Color, StrokeThickness, LineStyle.GetDashArray());
             }
 
             renderContext.ResetClip();
@@ -109,7 +108,7 @@
         {
             base.UpdateMaxMin();
 
-            DataPoint[] allPoints = Lines.SelectMany(a => a).ToArray();
+            DataPoint[] allPoints = Lines.SelectMany(l => l).ToArray();
 
             if (!allPoints.Any())
             {
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs	(.../ChartAreaDataConverterTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs	(.../ChartAreaDataConverterTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -37,7 +37,7 @@
     public class ChartAreaDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsChartDataConverter()
+        public void DefaultConstructor_IsItemBasedChartDataConverter()
         {
             // Call
             var converter = new ChartAreaDataConverter();
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs	(.../ChartLineDataConverterTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs	(.../ChartLineDataConverterTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -38,7 +38,7 @@
     public class ChartLineDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsChartDataConverter()
+        public void DefaultConstructor_IsItemBasedChartDataConverter()
         {
             // Call
             var converter = new ChartLineDataConverter();
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleAreaDataConverterTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleAreaDataConverterTest.cs	(.../ChartMultipleAreaDataConverterTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleAreaDataConverterTest.cs	(.../ChartMultipleAreaDataConverterTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -38,7 +38,7 @@
     public class ChartMultipleAreaDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsChartDataConverter()
+        public void DefaultConstructor_IsItemBasedChartDataConverter()
         {
             // Call
             var converter = new ChartMultipleAreaDataConverter();
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs
===================================================================
diff -u -rfa07631b4d1fac0c9d34aedfc19de6afc1e01f59 -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs	(.../ChartMultipleLineDataConverterTest.cs)	(revision fa07631b4d1fac0c9d34aedfc19de6afc1e01f59)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs	(.../ChartMultipleLineDataConverterTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -39,7 +39,7 @@
     public class ChartMultipleLineDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsChartDataConverter()
+        public void DefaultConstructor_ItemBasedChartDataConverter()
         {
             // Call
             var converter = new ChartMultipleLineDataConverter();
@@ -128,6 +128,7 @@
             // Assert
             Assert.AreEqual(width, multipleLineSeries.StrokeThickness);
         }
+
         [Test]
         [TestCase(DashStyle.Solid, LineStyle.Solid)]
         [TestCase(DashStyle.Dash, LineStyle.Dash)]
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs	(.../ChartPointDataConverterTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartPointDataConverterTest.cs	(.../ChartPointDataConverterTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -37,7 +37,7 @@
     public class ChartPointDataConverterTest
     {
         [Test]
-        public void DefaultConstructor_IsChartDataConverter()
+        public void DefaultConstructor_IsItemBasedChartDataConverter()
         {
             // Call
             var converter = new ChartPointDataConverter();
Index: Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleAreaSeriesTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleAreaSeriesTest.cs	(.../MultipleAreaSeriesTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleAreaSeriesTest.cs	(.../MultipleAreaSeriesTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -37,17 +37,16 @@
             var series = new MultipleAreaSeries();
 
             // Assert
-            Assert.AreEqual(OxyColors.Automatic, series.Fill);
-            Assert.AreEqual(OxyColors.Fuchsia, series.ActualFill);
-            Assert.AreEqual(OxyColors.Automatic, series.Color);
-            Assert.AreEqual(OxyColors.Fuchsia, series.ActualColor);
+            Assert.AreEqual(OxyColors.Fuchsia, series.Fill);
+            Assert.AreEqual(OxyColors.Fuchsia, series.Color);
             Assert.AreEqual(0, series.StrokeThickness);
             Assert.IsEmpty(series.Areas);
         }
 
         [Test]
         public void Render_NoContext_ThrowsArgumentNullException()
         {
+            // Setup
             var series = new MultipleAreaSeries();
 
             // Call
@@ -59,7 +58,7 @@
         }
 
         [Test]
-        public void Render_NoAreas_NoCallForRenderArea()
+        public void Render_NoAreas_NoCallForDrawPolygon()
         {
             // Setup
             var mocks = new MockRepository();
@@ -76,7 +75,7 @@
         }
 
         [Test]
-        public void Render_EmptyAreas_NoCallForRenderArea()
+        public void Render_EmptyAreas_NoCallForDrawPolygon()
         {
             // Setup
             var mocks = new MockRepository();
@@ -116,8 +115,8 @@
             renderContext.Stub(rc => rc.ResetClip());
             renderContext.Expect(rc => rc.DrawPolygon(
                                      Arg<ScreenPoint[]>.Matches(sp => sp.Length == pointCount),
-                                     Arg<OxyColor>.Is.Equal(series.ActualFill),
-                                     Arg<OxyColor>.Is.Equal(series.ActualColor),
+                                     Arg<OxyColor>.Is.Equal(series.Fill),
+                                     Arg<OxyColor>.Is.Equal(series.Color),
                                      Arg<double>.Is.Equal(series.StrokeThickness),
                                      Arg<double[]>.Is.Anything,
                                      Arg<LineJoin>.Is.Anything,
@@ -152,13 +151,13 @@
             model.Series.Add(series);
 
             var mocks = new MockRepository();
-            var renderContext = mocks.Stub<IRenderContext>();
+            var renderContext = mocks.StrictMock<IRenderContext>();
             renderContext.Stub(rc => rc.SetClip(OxyRect.Create(0, 0, 0, 0))).Return(true);
             renderContext.Stub(rc => rc.ResetClip());
             renderContext.Expect(rc => rc.DrawPolygon(
-                                     Arg<ScreenPoint[]>.Matches(sp => sp.Length > 0),
-                                     Arg<OxyColor>.Is.Equal(series.ActualFill),
-                                     Arg<OxyColor>.Is.Equal(series.ActualColor),
+                                     Arg<ScreenPoint[]>.Matches(sp => sp.Length == 1),
+                                     Arg<OxyColor>.Is.Equal(series.Fill),
+                                     Arg<OxyColor>.Is.Equal(series.Color),
                                      Arg<double>.Is.Equal(series.StrokeThickness),
                                      Arg<double[]>.Is.Anything,
                                      Arg<LineJoin>.Is.Anything,
Index: Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleLineSeriesTest.cs
===================================================================
diff -u -rfa07631b4d1fac0c9d34aedfc19de6afc1e01f59 -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleLineSeriesTest.cs	(.../MultipleLineSeriesTest.cs)	(revision fa07631b4d1fac0c9d34aedfc19de6afc1e01f59)
+++ Core/Components/test/Core.Components.OxyPlot.Test/CustomSeries/MultipleLineSeriesTest.cs	(.../MultipleLineSeriesTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -37,8 +37,7 @@
             var series = new MultipleLineSeries();
 
             // Assert
-            Assert.AreEqual(OxyColors.Automatic, series.Color);
-            Assert.AreEqual(OxyColors.Fuchsia, series.ActualColor);
+            Assert.AreEqual(OxyColors.Fuchsia, series.Color);
             Assert.AreEqual(0, series.StrokeThickness);
             Assert.AreEqual(LineStyle.Solid, series.LineStyle);
             Assert.IsEmpty(series.Lines);
@@ -58,7 +57,7 @@
         }
 
         [Test]
-        public void Render_NoLines_NoCallForRenderLine()
+        public void Render_NoLines_NoCallForDrawLine()
         {
             // Setup
             var mocks = new MockRepository();
@@ -75,7 +74,7 @@
         }
 
         [Test]
-        public void Render_EmptyLines_NoCallForRenderLine()
+        public void Render_EmptyLines_NoCallForDrawLine()
         {
             // Setup
             var mocks = new MockRepository();
@@ -115,7 +114,7 @@
             renderContext.Stub(rc => rc.ResetClip());
             renderContext.Expect(rc => rc.DrawLine(
                                      Arg<ScreenPoint[]>.Matches(sp => sp.Length == pointCount),
-                                     Arg<OxyColor>.Is.Equal(series.ActualColor),
+                                     Arg<OxyColor>.Is.Equal(series.Color),
                                      Arg<double>.Is.Equal(series.StrokeThickness),
                                      Arg<double[]>.Is.Anything,
                                      Arg<LineJoin>.Is.Anything,
@@ -130,7 +129,7 @@
                 line[i] = new DataPoint(random.Next(-50, 50), random.Next(-50, 50));
             }
 
-            ((IPlotModel)model).Update(false);
+            ((IPlotModel) model).Update(false);
 
             // Call
             series.Render(renderContext);
@@ -150,16 +149,16 @@
             model.Series.Add(series);
 
             var mocks = new MockRepository();
-            var renderContext = mocks.Stub<IRenderContext>();
+            var renderContext = mocks.StrictMock<IRenderContext>();
             renderContext.Stub(rc => rc.SetClip(OxyRect.Create(0, 0, 0, 0))).Return(true);
             renderContext.Stub(rc => rc.ResetClip());
             renderContext.Expect(rc => rc.DrawLine(
-                                     Arg<ScreenPoint[]>.Matches(sp => sp.Length  > 0),
-                                     Arg<OxyColor>.Is.Equal(series.ActualColor),
+                                     Arg<ScreenPoint[]>.Matches(sp => sp.Length == 1),
+                                     Arg<OxyColor>.Is.Equal(series.Color),
                                      Arg<double>.Is.Equal(series.StrokeThickness),
                                      Arg<double[]>.Is.Anything,
                                      Arg<LineJoin>.Is.Anything,
-                                     Arg<bool>.Is.Anything));
+                                     Arg<bool>.Is.Anything)).Repeat.Times(lineCount);
 
             mocks.ReplayAll();
 
@@ -171,7 +170,7 @@
                 });
             }
 
-            ((IPlotModel)model).Update(false);
+            ((IPlotModel) model).Update(false);
 
             // Call
             series.Render(renderContext);
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleAreaDataSeriesTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleAreaDataSeriesTest.cs	(.../ChartMultipleAreaDataSeriesTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleAreaDataSeriesTest.cs	(.../ChartMultipleAreaDataSeriesTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -171,8 +171,8 @@
             Assert.IsTrue(chartMultipleAreaDataSeries.IsVisible);
 
             Assert.AreEqual(0, chartMultipleAreaDataSeries.StrokeThickness);
-            Assert.AreEqual(OxyColor.FromArgb(0, 0, 0, 1), chartMultipleAreaDataSeries.Color);
-            Assert.AreEqual(OxyColor.FromArgb(0, 0, 0, 1), chartMultipleAreaDataSeries.Fill);
+            Assert.AreEqual(OxyColor.FromArgb(Color.Fuchsia.A, Color.Fuchsia.R, Color.Fuchsia.G, Color.Fuchsia.B), chartMultipleAreaDataSeries.Color);
+            Assert.AreEqual(OxyColor.FromArgb(Color.Fuchsia.A, Color.Fuchsia.R, Color.Fuchsia.G, Color.Fuchsia.B), chartMultipleAreaDataSeries.Fill);
 
             Assert.AreEqual(0, chartMultipleAreaDataSeries.Areas.Count);
         }
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs
===================================================================
diff -u -rfa07631b4d1fac0c9d34aedfc19de6afc1e01f59 -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs	(.../ChartMultipleLineDataSeriesTest.cs)	(revision fa07631b4d1fac0c9d34aedfc19de6afc1e01f59)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs	(.../ChartMultipleLineDataSeriesTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -172,7 +172,7 @@
             Assert.IsTrue(chartMultipleLineDataSeries.IsVisible);
 
             Assert.AreEqual(0, chartMultipleLineDataSeries.StrokeThickness);
-            Assert.AreEqual(OxyColor.FromArgb(0, 0, 0, 1), chartMultipleLineDataSeries.Color);
+            Assert.AreEqual(OxyColor.FromArgb(Color.Fuchsia.A, Color.Fuchsia.R, Color.Fuchsia.G, Color.Fuchsia.B), chartMultipleLineDataSeries.Color);
             Assert.AreEqual(LineStyle.Solid, chartMultipleLineDataSeries.LineStyle);
 
             Assert.AreEqual(0, chartMultipleLineDataSeries.Lines.Count);
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfa07631b4d1fac0c9d34aedfc19de6afc1e01f59 -raefd4f8600e09ea77d5bc37ffc56766763d5dcde
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision fa07631b4d1fac0c9d34aedfc19de6afc1e01f59)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
@@ -51,8 +51,8 @@
                 yield return new TestCaseData(new ChartPointData("test"), Resources.PointsIcon);
                 yield return new TestCaseData(new ChartLineData("test"), Resources.LineIcon);
                 yield return new TestCaseData(new ChartAreaData("test"), Resources.AreaIcon);
-                yield return new TestCaseData(new ChartMultipleAreaData("test data"), Resources.AreaIcon);
-                yield return new TestCaseData(new ChartMultipleLineData("test data"), Resources.LineIcon);
+                yield return new TestCaseData(new ChartMultipleAreaData("test"), Resources.AreaIcon);
+                yield return new TestCaseData(new ChartMultipleLineData("test"), Resources.LineIcon);
                 yield return new TestCaseData(new ChartDataCollection("test"), GuiResources.folder);
             }
         }
@@ -81,7 +81,7 @@
                     new ChartPointData("test"),
                     new ChartLineData("test"),
                     new ChartAreaData("Test"),
-                    new ChartMultipleAreaData("test data"),
+                    new ChartMultipleAreaData("test"),
                     new ChartMultipleLineData("Test")
                 };
             }
@@ -97,10 +97,10 @@
                 yield return new TestCaseData(new ChartLineData("test"), true);
                 yield return new TestCaseData(new ChartAreaData("test"), false);
                 yield return new TestCaseData(new ChartAreaData("test"), true);
-                yield return new TestCaseData(new ChartMultipleAreaData("test data"), false);
-                yield return new TestCaseData(new ChartMultipleAreaData("test data"), true);
-                yield return new TestCaseData(new ChartMultipleLineData("test data"), false);
-                yield return new TestCaseData(new ChartMultipleLineData("test data"), true);
+                yield return new TestCaseData(new ChartMultipleAreaData("test"), false);
+                yield return new TestCaseData(new ChartMultipleAreaData("test"), true);
+                yield return new TestCaseData(new ChartMultipleLineData("test"), false);
+                yield return new TestCaseData(new ChartMultipleLineData("test"), true);
             }
         }
 
@@ -179,7 +179,7 @@
             var chartData1 = new TestChartData();
             var chartData2 = new TestChartData();
             var chartData3 = new TestChartData();
-            var chartDataCollection = new ChartDataCollection("test data");
+            var chartDataCollection = new ChartDataCollection("test");
 
             chartDataCollection.Add(chartData1);
             chartDataCollection.Add(chartData2);
@@ -218,7 +218,7 @@
         public void CanDrag_WrappedDataChartMultipleAreaData_ReturnsFalse()
         {
             // Setup
-            var multipleChartAreaData = new ChartMultipleAreaData("test data");
+            var multipleChartAreaData = new ChartMultipleAreaData("test");
             ChartDataContext context = GetContext(multipleChartAreaData);
 
             // Call
@@ -246,7 +246,7 @@
         public void CanCheck_WrappedDataChartDataCollection_ReturnsFalse()
         {
             // Setup
-            ChartDataContext context = GetContext(new ChartDataCollection("test data"));
+            ChartDataContext context = GetContext(new ChartDataCollection("test"));
 
             // Call
             bool canCheck = info.CanCheck(context);
@@ -426,7 +426,7 @@
             var chartData1 = new TestChartData();
             var chartData2 = new TestChartData();
             var chartData3 = new TestChartData();
-            var chartDataCollection = new ChartDataCollection("test data");
+            var chartDataCollection = new ChartDataCollection("test");
 
             chartDataCollection.Add(chartData1);
             chartDataCollection.Add(chartData2);
@@ -454,7 +454,7 @@
         [Test]
         [TestCase(-50)]
         [TestCase(-1)]
-        [TestCase(4)]
+        [TestCase(5)]
         [TestCase(50)]
         public void OnDrop_ChartDataMovedToPositionOutsideRange_ThrowsException(int position)
         {
@@ -467,12 +467,14 @@
             var chartData2 = new ChartAreaData("area");
             var chartData3 = new ChartPointData("point");
             var chartData4 = new ChartMultipleAreaData("multiple area");
-            var chartDataCollection = new ChartDataCollection("test data");
+            var chartData5 = new ChartMultipleLineData("multiple line");
+            var chartDataCollection = new ChartDataCollection("test");
 
             chartDataCollection.Add(chartData1);
             chartDataCollection.Add(chartData2);
             chartDataCollection.Add(chartData3);
             chartDataCollection.Add(chartData4);
+            chartDataCollection.Add(chartData5);
 
             chartDataCollection.Attach(observer);
             chartLegendView.Data = chartDataCollection;