Index: Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -rb4535eabcb8d131b00bde746e21ef201b1ba4e80
--- Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -75,8 +75,14 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="PropertyClasses\ChartAreaDataProperties.cs" />
     <Compile Include="PropertyClasses\ChartDataCollectionProperties.cs" />
     <Compile Include="PropertyClasses\ChartDataProperties.cs" />
+    <Compile Include="PropertyClasses\ChartLineDataProperties.cs" />
+    <Compile Include="PropertyClasses\ChartMultipleAreaDataProperties.cs" />
+    <Compile Include="PropertyClasses\ChartMultipleLineDataProperties.cs" />
+    <Compile Include="PropertyClasses\ChartPointDataProperties.cs" />
+    <Compile Include="PropertyClasses\PointBasedChartDataProperties.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Index: Core/Plugins/src/Core.Plugins.Chart/Properties/Resources.Designer.cs
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -rb4535eabcb8d131b00bde746e21ef201b1ba4e80
--- Core/Plugins/src/Core.Plugins.Chart/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/src/Core.Plugins.Chart/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -137,6 +137,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Vlakken.
+        /// </summary>
+        public static string ChartDataProperties_Type_Areas {
+            get {
+                return ResourceManager.GetString("ChartDataProperties_Type_Areas", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Het type data dat wordt weergegeven in de gegevensreeks..
         /// </summary>
         public static string ChartDataProperties_Type_Description {
@@ -155,6 +164,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Lijnen.
+        /// </summary>
+        public static string ChartDataProperties_Type_Lines {
+            get {
+                return ResourceManager.GetString("ChartDataProperties_Type_Lines", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Punten.
+        /// </summary>
+        public static string ChartDataProperties_Type_Points {
+            get {
+                return ResourceManager.GetString("ChartDataProperties_Type_Points", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap ChartIcon {
Index: Core/Plugins/src/Core.Plugins.Chart/Properties/Resources.resx
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -rb4535eabcb8d131b00bde746e21ef201b1ba4e80
--- Core/Plugins/src/Core.Plugins.Chart/Properties/Resources.resx	(.../Resources.resx)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/src/Core.Plugins.Chart/Properties/Resources.resx	(.../Resources.resx)	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -214,4 +214,13 @@
   <data name="ChartDataProperties_Type_DisplayName" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="ChartDataProperties_Type_Points" xml:space="preserve">
+    <value>Punten</value>
+  </data>
+  <data name="ChartDataProperties_Type_Lines" xml:space="preserve">
+    <value>Lijnen</value>
+  </data>
+  <data name="ChartDataProperties_Type_Areas" xml:space="preserve">
+    <value>Vlakken</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartAreaDataProperties.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartAreaDataProperties.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartAreaDataProperties.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,40 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.Properties;
+
+namespace Core.Plugins.Chart.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="ChartAreaData"/> for the property panel.
+    /// </summary>
+    public class ChartAreaDataProperties : ChartDataProperties<ChartAreaData>
+    {
+        public override string Type
+        {
+            get
+            {
+                return Resources.ChartDataProperties_Type_Areas;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartDataProperties.cs
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -rb4535eabcb8d131b00bde746e21ef201b1ba4e80
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartDataProperties.cs	(.../ChartDataProperties.cs)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartDataProperties.cs	(.../ChartDataProperties.cs)	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -27,7 +27,8 @@
 
 namespace Core.Plugins.Chart.PropertyClasses
 {
-    public abstract class ChartDataProperties : ObjectProperties<ChartData>
+    public abstract class ChartDataProperties<TChartData> : ObjectProperties<TChartData>
+        where TChartData : ChartData
     {
         private const int namePropertyIndex = 0;
         private const int typePropertyIndex = 1;
@@ -55,7 +56,8 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartDataProperties_IsVisible_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ChartDataProperties_IsVisible_Description))]
-        public bool IsVisible {
+        public bool IsVisible
+        {
             get
             {
                 return data.IsVisible;
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartLineDataProperties.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartLineDataProperties.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartLineDataProperties.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,40 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.Properties;
+
+namespace Core.Plugins.Chart.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="ChartLineData"/> for the property panel.
+    /// </summary>
+    public class ChartLineDataProperties : ChartDataProperties<ChartLineData>
+    {
+        public override string Type
+        {
+            get
+            {
+                return Resources.ChartDataProperties_Type_Lines;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleAreaDataProperties.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleAreaDataProperties.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleAreaDataProperties.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,40 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.Properties;
+
+namespace Core.Plugins.Chart.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="ChartMultipleAreaData"/> for the property panel.
+    /// </summary>
+    public class ChartMultipleAreaDataProperties : ChartDataProperties<ChartMultipleAreaData>
+    {
+        public override string Type
+        {
+            get
+            {
+                return Resources.ChartDataProperties_Type_Areas;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleLineDataProperties.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleLineDataProperties.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleLineDataProperties.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,40 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.Properties;
+
+namespace Core.Plugins.Chart.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="ChartMultipleLineData"/> for the property panel.
+    /// </summary>
+    public class ChartMultipleLineDataProperties : ChartDataProperties<ChartMultipleLineData>
+    {
+        public override string Type
+        {
+            get
+            {
+                return Resources.ChartDataProperties_Type_Lines;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartPointDataProperties.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartPointDataProperties.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartPointDataProperties.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,40 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.Properties;
+
+namespace Core.Plugins.Chart.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="ChartPointData"/> for the property panel.
+    /// </summary>
+    public class ChartPointDataProperties : ChartDataProperties<ChartPointData>
+    {
+        public override string Type
+        {
+            get
+            {
+                return Resources.ChartDataProperties_Type_Points;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/PointBasedChartDataProperties.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/PointBasedChartDataProperties.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/PointBasedChartDataProperties.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,40 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.Properties;
+
+namespace Core.Plugins.Chart.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="PointBasedChartData"/> for the property panel.
+    /// </summary>
+    public class PointBasedChartDataProperties : ChartDataProperties<PointBasedChartData>
+    {
+        public override string Type
+        {
+            get
+            {
+                return Resources.ChartDataProperties_Type_Points;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -rb4535eabcb8d131b00bde746e21ef201b1ba4e80
--- Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj	(.../Core.Plugins.Chart.Test.csproj)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj	(.../Core.Plugins.Chart.Test.csproj)	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -72,8 +72,14 @@
     <Compile Include="PresentationObjects\ChartDataContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ChartingRibbonTest.cs" />
+    <Compile Include="PropertyClasses\ChartAreaDataPropertiesTest.cs" />
     <Compile Include="PropertyClasses\ChartDataCollectionPropertiesTest.cs" />
     <Compile Include="PropertyClasses\ChartDataPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\ChartLineDataPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\ChartMultipleAreaDataPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\ChartMultipleLineDataPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\ChartPointDataPropertiesTest.cs" />
+    <Compile Include="PropertyClasses\PointBasedChartDataPropertiesTest.cs" />
     <Compile Include="TestChartView.cs">
       <SubType>Component</SubType>
     </Compile>
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,43 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Plugins.Chart.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ChartAreaDataPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new ChartAreaDataProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ChartDataProperties<ChartAreaData>>(properties);
+            Assert.IsNull(properties.Data);
+            Assert.AreEqual("Vlakken", properties.Type);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartDataPropertiesTest.cs
===================================================================
diff -u -rf7ee6215e886711db4478d524e34718b6df434df -rb4535eabcb8d131b00bde746e21ef201b1ba4e80
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartDataPropertiesTest.cs	(.../ChartDataPropertiesTest.cs)	(revision f7ee6215e886711db4478d524e34718b6df434df)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartDataPropertiesTest.cs	(.../ChartDataPropertiesTest.cs)	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -131,7 +131,7 @@
                                                                             "Geeft aan of de gegevensreeks wordt weergegeven.");
         }
 
-        private class TestChartDataProperties : ChartDataProperties
+        private class TestChartDataProperties : ChartDataProperties<ChartData>
         {
             public override string Type
             {
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,43 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Plugins.Chart.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ChartLineDataPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new ChartLineDataProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ChartDataProperties<ChartLineData>>(properties);
+            Assert.IsNull(properties.Data);
+            Assert.AreEqual("Lijnen", properties.Type);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,43 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Plugins.Chart.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ChartMultipleAreaDataPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new ChartMultipleAreaDataProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ChartDataProperties<ChartMultipleAreaData>>(properties);
+            Assert.IsNull(properties.Data);
+            Assert.AreEqual("Vlakken", properties.Type);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,43 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Plugins.Chart.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ChartMultipleLineDataPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new ChartMultipleLineDataProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ChartDataProperties<ChartMultipleLineData>>(properties);
+            Assert.IsNull(properties.Data);
+            Assert.AreEqual("Lijnen", properties.Type);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,43 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Plugins.Chart.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ChartPointDataPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new ChartPointDataProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ChartDataProperties<ChartPointData>>(properties);
+            Assert.IsNull(properties.Data);
+            Assert.AreEqual("Punten", properties.Type);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/PointBasedChartDataPropertiesTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/PointBasedChartDataPropertiesTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/PointBasedChartDataPropertiesTest.cs	(revision b4535eabcb8d131b00bde746e21ef201b1ba4e80)
@@ -0,0 +1,43 @@
+// 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 Core.Components.Charting.Data;
+using Core.Plugins.Chart.PropertyClasses;
+using NUnit.Framework;
+
+namespace Core.Plugins.Chart.Test.PropertyClasses
+{
+    [TestFixture]
+    public class PointBasedChartDataPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new PointBasedChartDataProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ChartDataProperties<PointBasedChartData>>(properties);
+            Assert.IsNull(properties.Data);
+            Assert.AreEqual("Punten", properties.Type);
+        }
+    }
+}
\ No newline at end of file