diff --git a/ECSLight.csproj b/ECSLight.csproj
index ec77f6b..f9296f1 100644
--- a/ECSLight.csproj
+++ b/ECSLight.csproj
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}</ProjectGuid>
+    <ProjectGuid>{E6577ADB-B63D-4E2B-AA20-FA44ACC7651A}</ProjectGuid>
+    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ECSLight</RootNamespace>
     <AssemblyName>ECSLight</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -26,10 +24,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -37,28 +32,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unity .NET 3.5|AnyCPU'">
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Unity Web v3.5</TargetFrameworkProfile>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Unity .NET 3.5\</OutputPath>
-    <DefineConstants>UNITY</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <None Include=".gitignore" />
-    <None Include=".travis.yml" />
-    <None Include="LICENSE" />
-    <None Include="README.md" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="EntitySet.cs" />
     <Compile Include="ComponentManager.cs" />
     <Compile Include="Context.cs" />
     <Compile Include="Entity.cs" />
     <Compile Include="EntityManager.cs" />
+    <Compile Include="EntitySet.cs" />
     <Compile Include="IComponentManager.cs" />
     <Compile Include="IEntity.cs" />
     <Compile Include="IEntityManager.cs" />
@@ -66,9 +51,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SetManager.cs" />
   </ItemGroup>
-  <Import Condition="'$(Configuration)' == 'Debug'" Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Condition="'$(Configuration)' == 'Release'" Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Condition="'$(Configuration)' == 'Unity .NET 3.5'" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Content Include="LICENSE" />
+    <Content Include="README.md" />
+  </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">
diff --git a/ECSLight.sln b/ECSLight.sln
index 59c25d6..f896e31 100644
--- a/ECSLight.sln
+++ b/ECSLight.sln
@@ -1,31 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECSLight", "ECSLight.csproj", "{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}"
+# Visual Studio 2013
+VisualStudioVersion = 12.0.0.0
+MinimumVisualStudioVersion = 10.0.0.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECSLight", "ECSLight.csproj", "{E6577ADB-B63D-4E2B-AA20-FA44ACC7651A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECSLight Tests", "Tests\ECSLight Tests.csproj", "{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{6A87D437-0B41-4669-AB14-029A452B1624}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Unity .NET 3.5|Any CPU = Unity .NET 3.5|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}.Unity .NET 3.5|Any CPU.ActiveCfg = Unity .NET 3.5|Any CPU
-		{51AE03BA-D19C-46EF-8CC9-7B54E05D78F7}.Unity .NET 3.5|Any CPU.Build.0 = Unity .NET 3.5|Any CPU
-		{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}.Unity .NET 3.5|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BC4EAFE-3AFC-4B27-86C4-0713814B38B5}.Unity .NET 3.5|Any CPU.Build.0 = Debug|Any CPU
+		{E6577ADB-B63D-4E2B-AA20-FA44ACC7651A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6577ADB-B63D-4E2B-AA20-FA44ACC7651A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6577ADB-B63D-4E2B-AA20-FA44ACC7651A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6577ADB-B63D-4E2B-AA20-FA44ACC7651A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A87D437-0B41-4669-AB14-029A452B1624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A87D437-0B41-4669-AB14-029A452B1624}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A87D437-0B41-4669-AB14-029A452B1624}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A87D437-0B41-4669-AB14-029A452B1624}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
new file mode 100644
index 0000000..292ec3e
--- /dev/null
+++ b/Tests/Tests.csproj
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6A87D437-0B41-4669-AB14-029A452B1624}</ProjectGuid>
+    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tests</RootNamespace>
+    <AssemblyName>Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ComponentManagerTests.cs" />
+    <Compile Include="ContextTests.cs" />
+    <Compile Include="EntityManagerTests.cs" />
+    <Compile Include="EntitySetTests.cs" />
+    <Compile Include="EntityTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SetManagerTests.cs" />
+    <Compile Include="Stubs\AComponent.cs" />
+    <Compile Include="Stubs\BComponent.cs" />
+    <Compile Include="Stubs\DisposableComponent.cs" />
+    <Compile Include="Stubs\StubComponentManager.cs" />
+    <Compile Include="Stubs\StubEntity.cs" />
+    <Compile Include="Stubs\StubEntityManager.cs" />
+    <Compile Include="Stubs\StubSetManager.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ECSLight.csproj">
+      <Project>{e6577adb-b63d-4e2b-aa20-fa44acc7651a}</Project>
+      <Name>ECSLight</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