diff --git a/src/Managed.Test/Managed.Test.csproj b/src/Managed.UnitTests/Managed.UnitTests.csproj
similarity index 76%
rename from src/Managed.Test/Managed.Test.csproj
rename to src/Managed.UnitTests/Managed.UnitTests.csproj
index 3b77fbcc..d1364fe0 100644
--- a/src/Managed.Test/Managed.Test.csproj
+++ b/src/Managed.UnitTests/Managed.UnitTests.csproj
@@ -5,12 +5,12 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D645F295-5FB1-4091-939F-EDBEC797F17B}</ProjectGuid>
+    <ProjectGuid>{8C9A5D3F-A20C-4D24-A09C-98E187A8D720}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MathNet.Numerics.Test</RootNamespace>
-    <AssemblyName>MathNet.Numerics.Test</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <RootNamespace>MathNet.Numerics.UnitTests</RootNamespace>
+    <AssemblyName>MathNet.Numerics.UnitTests</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,6 +32,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/src/Managed.UnitTests/Properties/AssemblyInfo.cs b/src/Managed.UnitTests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..f1e02c2d
--- /dev/null
+++ b/src/Managed.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Resources;
+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("Math.NET Numerics (Managed) Unit Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Math.NET Project")]
+[assembly: AssemblyProduct("Math.NET Numerics")]
+[assembly: AssemblyCopyright("Copyright © Math.NET Project")]
+[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("475dd2ad-3fa9-42df-9790-4a444ed886ce")]
+
+// 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")]
+[assembly: NeutralResourcesLanguage("en")]
diff --git a/src/MathNet.Numerics.sln b/src/MathNet.Numerics.sln
index 2863fd22..a454e4c3 100644
--- a/src/MathNet.Numerics.sln
+++ b/src/MathNet.Numerics.sln
@@ -5,7 +5,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managed", "Managed\Managed.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Native", "Native\Native.csproj", "{4FE24723-A98A-4EB6-B266-03E35967695B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managed.Test", "Managed.Test\Managed.Test.csproj", "{D645F295-5FB1-4091-939F-EDBEC797F17B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managed.UnitTests", "Managed.UnitTests\Managed.UnitTests.csproj", "{8C9A5D3F-A20C-4D24-A09C-98E187A8D720}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Native.UnitTests", "Native.UnitTests\Native.UnitTests.csproj", "{0FCA7B04-D5B7-45B9-A7A5-423BEAD29114}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,10 +23,14 @@ Global
 		{4FE24723-A98A-4EB6-B266-03E35967695B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FE24723-A98A-4EB6-B266-03E35967695B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FE24723-A98A-4EB6-B266-03E35967695B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D645F295-5FB1-4091-939F-EDBEC797F17B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D645F295-5FB1-4091-939F-EDBEC797F17B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D645F295-5FB1-4091-939F-EDBEC797F17B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D645F295-5FB1-4091-939F-EDBEC797F17B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C9A5D3F-A20C-4D24-A09C-98E187A8D720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C9A5D3F-A20C-4D24-A09C-98E187A8D720}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C9A5D3F-A20C-4D24-A09C-98E187A8D720}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C9A5D3F-A20C-4D24-A09C-98E187A8D720}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FCA7B04-D5B7-45B9-A7A5-423BEAD29114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FCA7B04-D5B7-45B9-A7A5-423BEAD29114}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FCA7B04-D5B7-45B9-A7A5-423BEAD29114}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FCA7B04-D5B7-45B9-A7A5-423BEAD29114}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Native.UnitTests/Native.UnitTests.csproj b/src/Native.UnitTests/Native.UnitTests.csproj
new file mode 100644
index 00000000..d7a086e9
--- /dev/null
+++ b/src/Native.UnitTests/Native.UnitTests.csproj
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0FCA7B04-D5B7-45B9-A7A5-423BEAD29114}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Native.UnitTests</RootNamespace>
+    <AssemblyName>Native.UnitTests</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <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' ">
+    <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">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Native\Native.csproj">
+      <Project>{4FE24723-A98A-4EB6-B266-03E35967695B}</Project>
+      <Name>Native</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
diff --git a/src/Managed.Test/Properties/AssemblyInfo.cs b/src/Native.UnitTests/Properties/AssemblyInfo.cs
similarity index 80%
rename from src/Managed.Test/Properties/AssemblyInfo.cs
rename to src/Native.UnitTests/Properties/AssemblyInfo.cs
index 9374df0c..f2087ba2 100644
--- a/src/Managed.Test/Properties/AssemblyInfo.cs
+++ b/src/Native.UnitTests/Properties/AssemblyInfo.cs
@@ -1,10 +1,12 @@
 using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
+// 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("Math.NET Numerics (Test)")]
+[assembly: AssemblyTitle("Math.NET Numerics (Native) Unit Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Math.NET Project")]
@@ -13,18 +15,18 @@ using System.Runtime.InteropServices;
 [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
+// 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("2e405a5c-3b48-40e0-adf2-6f623b18373f")]
+[assembly: Guid("3b199806-db41-46df-8235-85e472577cfb")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version
+//      Minor Version 
 //      Build Number
 //      Revision
 //
@@ -33,3 +35,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguage("en")]