Index: Core/Components/src/Core.Components.Charting/Core.Components.Charting.csproj
===================================================================
diff -u -r271bd5ffd4d61da4324eb50957f062b14c4c6958 -r344646a09ee37435dd7b82f80e69f62c0f1bd128
--- Core/Components/src/Core.Components.Charting/Core.Components.Charting.csproj	(.../Core.Components.Charting.csproj)	(revision 271bd5ffd4d61da4324eb50957f062b14c4c6958)
+++ Core/Components/src/Core.Components.Charting/Core.Components.Charting.csproj	(.../Core.Components.Charting.csproj)	(revision 344646a09ee37435dd7b82f80e69f62c0f1bd128)
@@ -41,6 +41,7 @@
     <Compile Include="Data\ChartAreaData.cs" />
     <Compile Include="Data\ChartData.cs" />
     <Compile Include="Data\ChartDataCollection.cs" />
+    <Compile Include="Data\ChartDataCollectionExtensions.cs" />
     <Compile Include="Data\ChartLineData.cs" />
     <Compile Include="Data\ChartMultipleAreaData.cs" />
     <Compile Include="Data\ChartMultipleLineData.cs" />
Index: Core/Components/src/Core.Components.Charting/Data/ChartDataCollectionExtensions.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Charting/Data/ChartDataCollectionExtensions.cs	(revision 0)
+++ Core/Components/src/Core.Components.Charting/Data/ChartDataCollectionExtensions.cs	(revision 344646a09ee37435dd7b82f80e69f62c0f1bd128)
@@ -0,0 +1,61 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+namespace Core.Components.Charting.Data
+{
+    /// <summary>
+    /// Exentions methods for <see cref="ChartDataCollection"/>.
+    /// </summary>
+    public static class ChartDataCollectionExtensions
+    {
+        /// <summary>
+        /// Gets all the <see cref="ChartData"/> recursively in the given <paramref name="chartDataCollection"/>.
+        /// </summary>
+        /// <param name="chartDataCollection">The collection to get all <see cref="ChartData"/> from.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ChartData"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="chartDataCollection"/> is <c>null</c>.</exception>
+        public static IEnumerable<ChartData> GetChartDataRecursively(this ChartDataCollection chartDataCollection)
+        {
+            if (chartDataCollection == null)
+            {
+                throw new ArgumentNullException(nameof(chartDataCollection));
+            }
+            var chartDataList = new List<ChartData>();
+
+            foreach (ChartData chartData in chartDataCollection.Collection)
+            {
+                var nestedChartDataCollection = chartData as ChartDataCollection;
+                if (nestedChartDataCollection != null)
+                {
+                    chartDataList.AddRange(GetChartDataRecursively(nestedChartDataCollection));
+                    continue;
+                }
+
+                chartDataList.Add(chartData);
+            }
+
+            return chartDataList;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs
===================================================================
diff -u -r364dfcde1c00a33c19ab33f47373d862dae87067 -r344646a09ee37435dd7b82f80e69f62c0f1bd128
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs	(.../ChartControl.cs)	(revision 364dfcde1c00a33c19ab33f47373d862dae87067)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs	(.../ChartControl.cs)	(revision 344646a09ee37435dd7b82f80e69f62c0f1bd128)
@@ -157,6 +157,14 @@
             }
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            plotView.Dispose();
+            chartDataCollectionObserver.Dispose();
+
+            base.Dispose(disposing);
+        }
+
         /// <summary>
         /// Defines the area taken up by the visible map-data based on the provided map-data.
         /// </summary>
@@ -217,14 +225,6 @@
             return envelope;
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            plotView.Dispose();
-            chartDataCollectionObserver.Dispose();
-
-            base.Dispose(disposing);
-        }
-
         private void InitializePlotView()
         {
             plotView = new LinearPlotView
@@ -242,28 +242,9 @@
             Controls.Add(plotView);
         }
 
-        private static IEnumerable<ChartData> GetChartDataRecursively(ChartDataCollection chartDataCollection)
-        {
-            var chartDataList = new List<ChartData>();
-
-            foreach (ChartData chartData in chartDataCollection.Collection)
-            {
-                var nestedChartDataCollection = chartData as ChartDataCollection;
-                if (nestedChartDataCollection != null)
-                {
-                    chartDataList.AddRange(GetChartDataRecursively(nestedChartDataCollection));
-                    continue;
-                }
-
-                chartDataList.Add(chartData);
-            }
-
-            return chartDataList;
-        }
-
         private void HandleChartDataCollectionChange()
         {
-            List<ChartData> chartDataThatShouldBeDrawn = GetChartDataRecursively(Data).ToList();
+            List<ChartData> chartDataThatShouldBeDrawn = Data.GetChartDataRecursively().ToList();
             Dictionary<ChartData, DrawnChartData> drawnChartDataLookup = drawnChartDataList.ToDictionary(dcd => dcd.ChartData, dcd => dcd);
 
             DrawMissingChartDataOnCollectionChange(chartDataThatShouldBeDrawn, drawnChartDataLookup);
Index: Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj
===================================================================
diff -u -r271bd5ffd4d61da4324eb50957f062b14c4c6958 -r344646a09ee37435dd7b82f80e69f62c0f1bd128
--- Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj	(.../Core.Components.Charting.Test.csproj)	(revision 271bd5ffd4d61da4324eb50957f062b14c4c6958)
+++ Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj	(.../Core.Components.Charting.Test.csproj)	(revision 344646a09ee37435dd7b82f80e69f62c0f1bd128)
@@ -58,6 +58,7 @@
     <Compile Include="Data\ChartLineDataTest.cs" />
     <Compile Include="Data\ChartMultipleAreaDataTest.cs" />
     <Compile Include="Data\ChartMultipleLineDataTest.cs" />
+    <Compile Include="Data\ChartDataCollectionExtensionsTest.cs" />
     <Compile Include="Data\PointBasedChartDataTest.cs" />
     <Compile Include="Data\ChartPointDataTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartDataCollectionExtensionsTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartDataCollectionExtensionsTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartDataCollectionExtensionsTest.cs	(revision 344646a09ee37435dd7b82f80e69f62c0f1bd128)
@@ -0,0 +1,71 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Core.Components.Charting.Data;
+using NUnit.Framework;
+
+namespace Core.Components.Charting.Test.Data
+{
+    [TestFixture]
+    public class ChartDataCollectionExtensionsTest
+    {
+        [Test]
+        public void GetFeatureBasedChartDataRecursively_ChartDataCollectionNull_ThrowArgumentNullException()
+        {
+            // Setup
+            ChartDataCollection collection = null;
+
+            // Call
+            TestDelegate test = () => collection.GetChartDataRecursively();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("chartDataCollection", exception.ParamName);
+        }
+
+        [Test]
+        public void GetFeatureBasedChartDataRecursively_CollectionWithNestedData_ReturnAllFeatureBasedChartData()
+        {
+            // Setup            
+            var line = new ChartLineData("line");
+            var polygon = new ChartAreaData("polygon");
+            var nestedCollection = new ChartDataCollection("nested");
+            nestedCollection.Add(line);
+            nestedCollection.Add(polygon);
+
+            var collection = new ChartDataCollection("test");
+            var point = new ChartPointData("point");
+            collection.Add(point);
+            collection.Add(nestedCollection);
+
+            // Call
+            ChartData[] featureBasedChartDatas = collection.GetChartDataRecursively().ToArray();
+
+            // Assert
+            Assert.AreEqual(3, featureBasedChartDatas.Length);
+            Assert.IsInstanceOf<ChartPointData>(featureBasedChartDatas[0]);
+            Assert.IsInstanceOf<ChartLineData>(featureBasedChartDatas[1]);
+            Assert.IsInstanceOf<ChartAreaData>(featureBasedChartDatas[2]);
+        }
+    }
+}
\ No newline at end of file