Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -rf612f81e3d6435ddd1a9c571738aab54e6048a9e
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 61f3b606ba0003553fe583462bab6e493043be5e)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -100,14 +100,9 @@
     <Compile Include="Converter\MapDataCollectionConverterTest.cs" />
     <Compile Include="Converter\MapLineDataConverterTest.cs" />
     <Compile Include="Converter\MapPolygonDataConverterTest.cs" />
-    <Compile Include="Data\MapDataCollectionTest.cs" />
     <Compile Include="Converter\MapDataConverterTest.cs" />
     <Compile Include="Converter\MapDataFactoryTest.cs" />
     <Compile Include="Converter\MapPointDataConverterTest.cs" />
-    <Compile Include="Data\MapLineDataTest.cs" />
-    <Compile Include="Data\MapPointDataTest.cs" />
-    <Compile Include="Data\MapPolygonDataTest.cs" />
-    <Compile Include="Data\PointsBasedMapDataTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
Fisheye: Tag f612f81e3d6435ddd1a9c571738aab54e6048a9e refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f612f81e3d6435ddd1a9c571738aab54e6048a9e refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f612f81e3d6435ddd1a9c571738aab54e6048a9e refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f612f81e3d6435ddd1a9c571738aab54e6048a9e refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f612f81e3d6435ddd1a9c571738aab54e6048a9e refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Data/PointsBasedMapDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Core.Components.Gis.Test</RootNamespace>
+    <AssemblyName>Core.Components.Gis.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\Debug\</OutputPath>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Data\MapDataCollectionTest.cs" />
+    <Compile Include="Data\MapLineDataTest.cs" />
+    <Compile Include="Data\MapPointDataTest.cs" />
+    <Compile Include="Data\MapPolygonDataTest.cs" />
+    <Compile Include="Data\PointsBasedMapDataTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj">
+      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
+      <Name>Core.Components.Gis</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. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,38 @@
+using System;
+using System.Linq;
+
+using Core.Common.TestUtil;
+using Core.Components.Gis.Data;
+
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data
+{
+    [TestFixture]
+    public class MapDataCollectionTest
+    {
+        [Test]
+        public void Constructor_NullList_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new MapDataCollection(null);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A list collection is required when creating MapDataCollection.");
+        }
+
+        [Test]
+        public void Constructor_ListSet_InstanceWithListSet()
+        {
+            // Setup
+            var list = Enumerable.Empty<MapData>().ToList();
+
+            // Call
+            var collection = new MapDataCollection(list);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(collection);
+            Assert.AreSame(list, collection.List);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.ObjectModel;
+
+using Core.Common.TestUtil;
+using Core.Components.Gis.Data;
+
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data
+{
+    [TestFixture]
+    public class MapLineDataTest
+    {
+        [Test]
+        public void Constructor_NullPoints_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new MapLineData(null);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
+        }
+
+        [Test]
+        public void Constructor_WithEmptyPoints_CreatesNewMapLineData()
+        {
+            // Setup
+            var points = new Collection<Tuple<double, double>>();
+
+            // Call
+            var data = new MapLineData(points);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(data);
+            Assert.AreNotSame(points, data.Points);
+        }
+
+        [Test]
+        public void Constructor_WithPoints_CreatesNewMapLineData()
+        {
+            // Setup
+            var points = CreateTestPoints();
+
+            // Call
+            var data = new MapLineData(points);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(data);
+            Assert.AreNotSame(points, data.Points);
+            CollectionAssert.AreEqual(points, data.Points);
+        }
+
+        private static Collection<Tuple<double, double>> CreateTestPoints()
+        {
+            return new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6)
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.ObjectModel;
+
+using Core.Common.TestUtil;
+using Core.Components.Gis.Data;
+
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data
+{
+    [TestFixture]
+    public class MapPointDataTest
+    {
+        [Test]
+        public void Constructor_NullPoints_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new MapPointData(null);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
+        }
+
+        [Test]
+        public void Constructor_WithEmptyPoints_CreatesNewMapPointData()
+        {
+            // Setup
+            var points = new Collection<Tuple<double, double>>();
+
+            // Call
+            var data = new MapPointData(points);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(data);
+            Assert.AreNotSame(points, data.Points);
+        }
+
+        [Test]
+        public void Constructor_WithPoints_CreatesNewMapPointData()
+        {
+            // Setup
+            var points = CreateTestPoints();
+
+            // Call
+            var data = new MapPointData(points);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(data);
+            Assert.AreNotSame(points, data.Points);
+            CollectionAssert.AreEqual(points, data.Points);
+        }
+
+        private Collection<Tuple<double, double>> CreateTestPoints()
+        {
+            return new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6)
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.ObjectModel;
+
+using Core.Common.TestUtil;
+using Core.Components.Gis.Data;
+
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data
+{
+    [TestFixture]
+    public class MapPolygonDataTest
+    {
+        [Test]
+        public void Constructor_NullPoints_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new MapPolygonData(null);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData)));
+        }
+
+        [Test]
+        public void Constructor_WithEmptyPoints_CreatesNewMapPolygonData()
+        {
+            // Setup
+            var points = new Collection<Tuple<double, double>>();
+
+            // Call
+            var data = new MapPolygonData(points);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(data);
+            Assert.AreNotSame(points, data.Points);
+        }
+
+        [Test]
+        public void Constructor_WithPoints_CreatesNewMapPolygonData()
+        {
+            // Setup
+            var points = CreateTestPoints();
+
+            // Call
+            var data = new MapPolygonData(points);
+
+            // Assert
+            Assert.IsInstanceOf<MapData>(data);
+            Assert.AreNotSame(points, data.Points);
+            CollectionAssert.AreEqual(points, data.Points);
+        }
+
+        private static Collection<Tuple<double, double>> CreateTestPoints()
+        {
+            return new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6)
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Core.Common.TestUtil;
+using Core.Components.Gis.Data;
+
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Test.Data
+{
+    [TestFixture]
+    public class PointsBasedMapDataTest
+    {
+        [Test]
+        public void Constructor_WithoutPoints_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new TestPointBasedMapData(null);
+
+            // Assert
+            var expectedMessage = "A point collection is required when creating a subclass of Core.Components.Gis.Data.PointBasedMapData.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, expectedMessage);
+        }
+
+        [Test]
+        public void Constructor_WithPoints_PropertiesSet()
+        {
+            // Setup
+            var points = new Collection<Tuple<double, double>>
+            {
+                Tuple.Create(0.0, 1.0),
+                Tuple.Create(2.5, 1.1)
+            };
+
+            // Call
+            var data = new TestPointBasedMapData(points);
+
+            // Assert
+            Assert.AreNotSame(points, data.Points);
+            CollectionAssert.AreEqual(points, data.Points);
+            Assert.IsTrue(data.IsVisible);
+        }
+
+        private class TestPointBasedMapData : PointBasedMapData
+        {
+            public TestPointBasedMapData(IEnumerable<Tuple<double, double>> points) : base(points) {}
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/Properties/AssemblyInfo.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/Properties/AssemblyInfo.cs	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Core.Components.Gis.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Core.Components.Gis.Test")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("04297414-8a13-4e86-b41b-c67f19edd5db")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Index: Core/Components/test/Core.Components.Gis.Test/packages.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/packages.config	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/packages.config	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets.sln
===================================================================
diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -rf612f81e3d6435ddd1a9c571738aab54e6048a9e
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 61f3b606ba0003553fe583462bab6e493043be5e)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision f612f81e3d6435ddd1a9c571738aab54e6048a9e)
@@ -232,6 +232,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.Data.Test", "Ringtoets\HydraRing\test\Ringtoets.HydraRing.Data.Test\Ringtoets.HydraRing.Data.Test.csproj", "{BFD6A78A-237A-413F-8DC3-8EC6E8C5809C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.Gis.Test", "Core\Components\test\Core.Components.Gis.Test\Core.Components.Gis.Test.csproj", "{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CreateInstaller|Any CPU = CreateInstaller|Any CPU
@@ -1936,6 +1938,31 @@
 		{BFD6A78A-237A-413F-8DC3-8EC6E8C5809C}.ReleaseForCodeCoverage|Mixed Platforms.ActiveCfg = Release|x86
 		{BFD6A78A-237A-413F-8DC3-8EC6E8C5809C}.ReleaseForCodeCoverage|x86.ActiveCfg = Release|x86
 		{BFD6A78A-237A-413F-8DC3-8EC6E8C5809C}.ReleaseForCodeCoverage|x86.Build.0 = Release|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstaller|Any CPU.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstaller|Mixed Platforms.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstaller|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstaller|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstaller|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstallerWithDemoProject|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.CreateInstallerWithDemoProject|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Debug|x86.ActiveCfg = Debug|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Debug|x86.Build.0 = Debug|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Release|Any CPU.ActiveCfg = Release|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Release|Mixed Platforms.Build.0 = Release|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Release|x86.ActiveCfg = Release|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.Release|x86.Build.0 = Release|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.ReleaseForCodeCoverage|Any CPU.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.ReleaseForCodeCoverage|Mixed Platforms.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.ReleaseForCodeCoverage|Mixed Platforms.Build.0 = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2028,6 +2055,7 @@
 		{F40A7DC1-A697-41A7-8676-6C0AD8274FB4} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
 		{E900A014-CA87-4374-87F0-813D653A9698} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
 		{9B6F3987-EAF7-4733-80C1-3DCAB44D87AE} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
+		{CCA12632-92B8-46DB-A3CA-E3C7C92B1AB0} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
 		{594C5C6D-5833-4E1C-9F30-13A202628EEF} = {EE8D5A6C-4871-452A-A69B-F04E374D715E}
 		{555F3460-DD3D-4B1D-8319-0AA454050FF7} = {EC6E52A5-2BB1-4080-9784-5DC8D0B08ED3}
 		{F2C4C4F7-4058-4E71-859B-D704F15D2745} = {555F3460-DD3D-4B1D-8319-0AA454050FF7}