Build: make whole unit test suite hybrid so it can run against all portable profiles

13 years ago · 2f275c1fb0
74 changed files with 942 additions and 673 deletions
--- a/MathNet.Numerics.Portable.sln
+++ b/MathNet.Numerics.Portable.sln
@ -1,16 +1,18 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable47", "src\Numerics\Portable.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable", "src\Numerics\Portable.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable47", "src\FSharp\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable", "src\FSharp\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}"
 	ProjectSection(ProjectDependencies) = postProject
 		{49205185-621E-FFB9-2104-887C9F1BBD13} = {49205185-621E-FFB9-2104-887C9F1BBD13}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{81D2CBEF-1C80-4389-A341-F010E8F86CDB}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTestsPortable47", "src\FSharpUnitTests\FSharpUnitTestsPortable.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTestsPortable", "src\FSharpUnitTests\FSharpUnitTestsPortable.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestsPortable", "src\UnitTests\UnitTestsPortable.csproj", "{0672ED13-CE61-4D3C-B879-282472817235}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -37,11 +39,18 @@ Global
 		{90CE8E32-354E-4728-8FE6-87342F469321}.Release136|Any CPU.Build.0 = Release136|Any CPU
 		{90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.ActiveCfg = Release47|Any CPU
 		{90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.Build.0 = Release47|Any CPU
+		{0672ED13-CE61-4D3C-B879-282472817235}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU
+		{0672ED13-CE61-4D3C-B879-282472817235}.Debug47|Any CPU.Build.0 = Debug47|Any CPU
+		{0672ED13-CE61-4D3C-B879-282472817235}.Release136|Any CPU.ActiveCfg = Release136|Any CPU
+		{0672ED13-CE61-4D3C-B879-282472817235}.Release136|Any CPU.Build.0 = Release136|Any CPU
+		{0672ED13-CE61-4D3C-B879-282472817235}.Release47|Any CPU.ActiveCfg = Release47|Any CPU
+		{0672ED13-CE61-4D3C-B879-282472817235}.Release47|Any CPU.Build.0 = Release47|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{90CE8E32-354E-4728-8FE6-87342F469321} = {81D2CBEF-1C80-4389-A341-F010E8F86CDB}
+		{0672ED13-CE61-4D3C-B879-282472817235} = {81D2CBEF-1C80-4389-A341-F010E8F86CDB}
 	EndGlobalSection
 EndGlobal
--- a/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj
+++ b/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj
@ -8,13 +8,14 @@
    <ProjectGuid>90ce8e32-354e-4728-8fe6-87342f469321</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>FSharpPortableUnitTests</RootNamespace>
-    <AssemblyName>FSharpPortableUnitTests</AssemblyName>
+    <AssemblyName>MathNet.Numerics.FSharp.UnitTests</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <Name>FSharpPortableUnitTests</Name>
    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug47|AnyCPU' ">
    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AssemblyName>MathNet.Numerics.FSharp.UnitTests47</AssemblyName>
    <OutputPath>..\..\out\test\debug\Portable47\</OutputPath>
    <Optimize>false</Optimize>
    <Tailcalls>false</Tailcalls>
@ -25,6 +26,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release47|AnyCPU' ">
    <DefineConstants>TRACE</DefineConstants>
+    <AssemblyName>MathNet.Numerics.FSharp.UnitTests47</AssemblyName>
    <OutputPath>..\..\out\test\Portable47\</OutputPath>
    <Optimize>true</Optimize>
    <Tailcalls>true</Tailcalls>
@ -34,6 +36,7 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release136|AnyCPU' ">
    <DefineConstants>TRACE;NOSYSNUMERICS</DefineConstants>
+    <AssemblyName>MathNet.Numerics.FSharp.UnitTests136</AssemblyName>
    <OutputPath>..\..\out\test\Portable136\</OutputPath>
    <Optimize>true</Optimize>
    <Tailcalls>true</Tailcalls>
--- a/src/Numerics/NumberTheory/IntegerTheory.Euclid.cs
+++ b/src/Numerics/NumberTheory/IntegerTheory.Euclid.cs
@ -118,8 +118,8 @@ namespace MathNet.Numerics.NumberTheory
            {
                long rem;
 #if PORTABLE
-                rem = a / b;
-                var quot = a % b;
+                rem = a % b;
+                var quot = a / b;
 #else
                long quot = Math.DivRem(a, b, out rem);
 #endif
--- a/src/Numerics/Numerics.csproj
+++ b/src/Numerics/Numerics.csproj
@ -46,8 +46,7 @@
    <DefineConstants>TRACE;DEBUG;NATIVEMKL</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile />
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
--- a/src/Numerics/Portable.csproj
+++ b/src/Numerics/Portable.csproj
@ -23,6 +23,8 @@
    <DebugSymbols>true</DebugSymbols>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <DocumentationFile />
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release47|AnyCPU' ">
    <TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
@ -32,18 +34,22 @@
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>1591</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release136|AnyCPU' ">
    <TargetFrameworkProfile>Profile136</TargetFrameworkProfile>
    <DefineConstants>TRACE;PORTABLE;NOSYSNUMERICS</DefineConstants>
-    <OutputPath>bin\Portable136\</OutputPath>
+    <OutputPath>..\..\out\lib\Portable136\</OutputPath>
    <DocumentationFile>..\..\out\lib\Portable136\MathNet.Numerics.XML</DocumentationFile>
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>1591</NoWarn>
  </PropertyGroup>
  <ItemGroup>
    <!-- A reference to the entire .NET Framework is automatically included -->
--- a/src/Numerics/Properties/AssemblyInfo.cs
+++ b/src/Numerics/Properties/AssemblyInfo.cs
@ -29,9 +29,9 @@
 using System;
 using System.Reflection;
 using System.Resources;
+using System.Runtime.CompilerServices;

 #if !PORTABLE
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 #endif

@ -50,6 +50,9 @@ using System.Runtime.InteropServices;
 #if PORTABLE

 [assembly: AssemblyTitle("Math.NET Numerics - Portable Edition")]
+[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests")]
+[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests47")]
+[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests136")]

 #else

--- a/src/UnitTests/ArrayHelpers.cs
+++ b/src/UnitTests/ArrayHelpers.cs
@ -24,6 +24,11 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+#if PORTABLE
+using System.Collections.Generic;
+using System.Linq;
+#endif
+
 namespace MathNet.Numerics.UnitTests
 {
    using System;
@ -59,7 +64,7 @@ namespace MathNet.Numerics.UnitTests
    /// </summary>
    /// <typeparam name="T">The type of the elements of the array.</typeparam>
    /// <param name="list">The one-dimensional, zero-based Array to search.</param>
-    /// <param name="match">The Predicate<> that defines the conditions of the elements to search for.</param>
+    /// <param name="match">The Predicate that defines the conditions of the elements to search for.</param>
    /// <returns>true if array contains one or more elements that match the conditions defined by the specified predicate; otherwise, false.</returns>
        public static bool Exists<T>(this List<T> list, Predicate<T> match)
        {
--- a/src/UnitTests/AssertHelpers.cs
+++ b/src/UnitTests/AssertHelpers.cs
@ -24,11 +24,16 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System.Collections.Generic;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests
 {
-    using System.Collections.Generic;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// A class which includes some assertion helper methods particularly for numerical code.
--- a/src/UnitTests/ComplexTests/Complex32Test.cs
+++ b/src/UnitTests/ComplexTests/Complex32Test.cs
@ -24,11 +24,16 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.ComplexTests
 {
-    using System;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Complex32 tests.
--- a/src/UnitTests/ComplexTests/ComplexTest.TextHandling.cs
+++ b/src/UnitTests/ComplexTests/ComplexTest.TextHandling.cs
@ -24,12 +24,17 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System;
+using System.Globalization;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.ComplexTests
 {
-    using System;
-    using System.Globalization;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Complex text handling tests
--- a/src/UnitTests/ComplexTests/ComplexTest.cs
+++ b/src/UnitTests/ComplexTests/ComplexTest.cs
@ -24,10 +24,15 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.ComplexTests
 {
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Complex extension methods tests.
--- a/src/UnitTests/IntegralTransformsTests/FourierTest.cs
+++ b/src/UnitTests/IntegralTransformsTests/FourierTest.cs
@ -25,7 +25,6 @@
 // </copyright>

 using System;
-using System.Numerics;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.IntegralTransforms;
 using MathNet.Numerics.IntegralTransforms.Algorithms;
@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests
 {
    using Random = System.Random;

+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    /// <summary>
    /// Fourier test.
    /// </summary>
--- a/src/UnitTests/IntegralTransformsTests/HartleyTest.cs
+++ b/src/UnitTests/IntegralTransformsTests/HartleyTest.cs
@ -25,7 +25,6 @@
 // </copyright>

 using System;
-using System.Numerics;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.IntegralTransforms;
 using MathNet.Numerics.IntegralTransforms.Algorithms;
@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests
 {
    using Random = System.Random;

+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    /// <summary>
    /// Hartley tests.
    /// </summary>
--- a/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs
+++ b/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs
@ -25,7 +25,6 @@
 // </copyright>

 using System;
-using System.Numerics;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.IntegralTransforms;
 using MathNet.Numerics.IntegralTransforms.Algorithms;
@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests
 {
    using Random = System.Random;

+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    /// <summary>
    /// Inverse Transform test.
    /// </summary>
--- a/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs
+++ b/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs
@ -25,7 +25,6 @@
 // </copyright>

 using System;
-using System.Numerics;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.IntegralTransforms;
 using MathNet.Numerics.IntegralTransforms.Algorithms;
@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests
 {
    using Random = System.Random;

+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    /// <summary>
    /// Matching Naive transform tests.
    /// </summary>
--- a/src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs
+++ b/src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs
@ -25,7 +25,6 @@
 // </copyright>

 using System.Linq;
-using System.Numerics;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.IntegralTransforms;
 using MathNet.Numerics.IntegralTransforms.Algorithms;
@ -37,6 +36,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests
 {
    using Random = System.Random;

+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    /// <summary>
    /// Parseval theorem verification tests.
    /// </summary>
--- a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs
+++ b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs
@ -39,7 +39,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Base class for linear algebra provider tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Dense matrix tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs
@ -28,12 +28,17 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using MathNet.Numerics.LinearAlgebra;
+using MathNet.Numerics.LinearAlgebra.Complex;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using LinearAlgebra;
-    using LinearAlgebra.Complex;
-    using NUnit.Framework;
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    [TestFixture]
    public class DenseVectorArithmeticTheory : VectorArithmeticTheory
--- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs
@ -36,7 +36,11 @@ using System.Collections.Generic;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Dense vector tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Diagonal matrix tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs
@ -30,7 +30,11 @@ using System;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Cholesky factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs
@ -29,7 +29,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs
@ -31,7 +31,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// GramSchmidt factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs
@ -30,7 +30,11 @@ using System;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// LU factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs
@ -32,7 +32,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// QR factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs
@ -30,7 +30,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Svd factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserCholeskyTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserCholeskyTests.cs
@ -24,11 +24,16 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Cholesky factorization tests for a user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserEvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserEvdTests.cs
@ -28,7 +28,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for an user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserGramSchmidtTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserGramSchmidtTests.cs
@ -30,7 +30,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// GramSchmidt factorization tests for a user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserLUTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserLUTests.cs
@ -24,11 +24,16 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// LU factorization tests for a user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs
@ -31,7 +31,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// QR factorization tests for a user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserSvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserSvdTests.cs
@ -29,7 +29,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Svd factorization tests for a user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs
@ -37,7 +37,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Base class for matrix tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs
@ -37,7 +37,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    [TestFixture]
    public class MatrixStructureTheory : MatrixStructureTheory<Complex>
--- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs
@ -32,7 +32,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Abstract class with the common set of matrix tests
--- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.cs
@ -24,10 +24,10 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using NUnit.Framework;
-
    /// <summary>
    /// Abstract class with the common set of matrix tests
    /// </summary>
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Tests of Bi-Conjugate Gradient stabilized iterative matrix solver.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Tests for Generalized Product Bi-Conjugate Gradient iterative matrix solver.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Tests for Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Tests of Transpose Free Quasi-Minimal Residual iterative matrix solver.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs
@ -37,7 +37,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Iterator tests
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs
@ -35,7 +35,6 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Preconditioners
 {
-
 #if NOSYSNUMERICS
    using Complex = Numerics.Complex;
 #else
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Divergence stop criterium test.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Failure stop criterium tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs
@ -35,7 +35,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Iteration count stop criterium tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Residual stop criterium tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs
@ -36,7 +36,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Sparse matrix tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs
@ -34,7 +34,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    [TestFixture]
    public class SparseVectorArithmeticTheory : VectorArithmeticTheory
--- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs
@ -37,7 +37,11 @@ using System.Collections.Generic;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Sparse vector tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs
@ -29,7 +29,11 @@ using MathNet.Numerics.LinearAlgebra.Storage;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// User-defined matrix implementation (internal class for testing purposes)
--- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs
@ -28,7 +28,11 @@ using MathNet.Numerics.LinearAlgebra;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Test class for user-defined matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs
@ -29,7 +29,11 @@ using MathNet.Numerics.LinearAlgebra.Storage;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// User-defined vector implementation (internal class for testing purposes)
--- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs
@ -30,7 +30,11 @@ using System.Collections.Generic;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Test class for user-defined vector.
--- a/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs
@ -28,10 +28,15 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    [TestFixture]
    public abstract class VectorArithmeticTheory : VectorArithmeticTheory<Complex>
--- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs
@ -24,13 +24,17 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System;
 using MathNet.Numerics.LinearAlgebra;
 using NUnit.Framework;
-using System;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Abstract class with the common arithmetic set of vector tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Norm.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Norm.cs
@ -24,11 +24,15 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Abstract class with the norms set of vector tests.
@ -91,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
        {
            var vector = CreateVector(Data);
            AssertHelpers.AlmostEqual(5.09901951359279, vector.InfinityNorm(), 14);
-            AssertHelpers.AlmostEqual(5.09901951359279, vector.Norm(Double.PositiveInfinity), 14);
+            AssertHelpers.AlmostEqual(5.09901951359279, vector.Norm(double.PositiveInfinity), 14);
        }

        /// <summary>
--- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs
@ -39,7 +39,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Abstract class with the common set of vector tests.
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs
@ -29,8 +29,13 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization
 {
-    using System.Numerics;
-    using Complex32 = Numerics.Complex32;
+    using Numerics;
+
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserEvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserEvdTests.cs
@ -28,8 +28,13 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization
 {
-    using System.Numerics;
-    using Complex32 = Numerics.Complex32;
+    using Numerics;
+
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for an user matrix.
--- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs
@ -29,7 +29,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserEvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserEvdTests.cs
@ -28,7 +28,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for an user matrix.
--- a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs
+++ b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs
@ -121,6 +121,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests
            Assert.That(clone.ColumnCount, Is.EqualTo(matrix.ColumnCount));
        }

+#if !PORTABLE
        [Theory]
        public void CanCloneUsingICloneable(Matrix<T> matrix)
        {
@ -130,6 +131,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests
            Assert.That(clone.RowCount, Is.EqualTo(matrix.RowCount));
            Assert.That(clone.ColumnCount, Is.EqualTo(matrix.ColumnCount));
        }
+#endif

        [Theory]
        public void CanCopyTo(Matrix<T> matrix)
--- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs
@ -29,7 +29,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for a dense matrix.
--- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserEvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserEvdTests.cs
@ -28,7 +28,11 @@ using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization
 {
-    using System.Numerics;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Eigenvalues factorization tests for an user matrix.
--- a/src/UnitTests/MatrixHelpers.cs
+++ b/src/UnitTests/MatrixHelpers.cs
@ -24,12 +24,17 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

-using MathNet.Numerics.LinearAlgebra;
 using System;
-using System.Numerics;
+using MathNet.Numerics.LinearAlgebra;

 namespace MathNet.Numerics.UnitTests
 {
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    /// <summary>
    /// Matrix utility functions to simplify tests.
    /// </summary>
--- a/src/UnitTests/NumberTheoryTests/GcdRelatedTestBigInteger.cs
+++ b/src/UnitTests/NumberTheoryTests/GcdRelatedTestBigInteger.cs
@ -24,13 +24,15 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+#if !NOSYSNUMERICS
+
+using System;
+using System.Numerics;
+using MathNet.Numerics.NumberTheory;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests.NumberTheoryTests
 {
-    using System;
-    using System.Numerics;
-    using NumberTheory;
-    using NUnit.Framework;
-
    /// <summary>
    /// GreatestCommonDivisor related test for <c>BigInteger</c>.
    /// </summary>
@ -217,3 +219,4 @@ namespace MathNet.Numerics.UnitTests.NumberTheoryTests
        }
    }
 }
+#endif
--- a/src/UnitTests/Properties/Settings.Designer.cs
+++ b/src/UnitTests/Properties/Settings.Designer.cs
@ -1,7 +1,7 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.18051
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@ -12,7 +12,7 @@ namespace MathNet.Numerics.UnitTests.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/src/UnitTests/Random/SystemCryptoTests.cs
+++ b/src/UnitTests/Random/SystemCryptoTests.cs
@ -24,6 +24,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+#if !PORTABLE
 namespace MathNet.Numerics.UnitTests.Random
 {
    using Numerics.Random;
@ -44,3 +45,4 @@ namespace MathNet.Numerics.UnitTests.Random
        }
    }
 }
+#endif
--- a/src/UnitTests/RootFindingTests/FindRootsTest.cs
+++ b/src/UnitTests/RootFindingTests/FindRootsTest.cs
@ -29,11 +29,16 @@
 // </copyright>

 using System;
-using System.Numerics;
 using NUnit.Framework;

 namespace MathNet.Numerics.UnitTests.RootFindingTests
 {
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif
+
    [TestFixture]
    internal class FindRootsTest
    {
--- a/src/UnitTests/TrigonometryTest.cs
+++ b/src/UnitTests/TrigonometryTest.cs
@ -24,11 +24,16 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>

+using System;
+using NUnit.Framework;
+
 namespace MathNet.Numerics.UnitTests
 {
-    using System;
-    using System.Numerics;
-    using NUnit.Framework;
+#if NOSYSNUMERICS
+    using Complex = Numerics.Complex;
+#else
+    using Complex = System.Numerics.Complex;
+#endif

    /// <summary>
    /// Trigonometry tests.
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@ -17,16 +17,17 @@
    <SignAssembly Condition=" '$(SignAssembly)' == '' ">false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <OutputPath>..\..\out\test\debug\Net40\</OutputPath>
    <!-- Conditional Strong Name: NO -->
    <SignAssembly>false</SignAssembly>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;SYSNUMERICS</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>AnyCPU</PlatformTarget>
+    <NoWarn>1591</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <OutputPath>..\..\out\test\Net40\</OutputPath>
@ -34,10 +35,11 @@
    <SignAssembly>false</SignAssembly>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;SYSNUMERICS</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>1591</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Signed|AnyCPU'">
    <OutputPath>..\..\out\test\signed\Net40\</OutputPath>
@ -45,10 +47,11 @@
    <SignAssembly>true</SignAssembly>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;SYSNUMERICS;STRONGNAME</DefineConstants>
+    <DefineConstants>TRACE;STRONGNAME</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>1591</NoWarn>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@ -66,36 +69,20 @@
  <ItemGroup>
    <Compile Include="ArrayHelpers.cs" />
    <Compile Include="AssertHelpers.cs" />
-    <Compile Include="CombinatoricsTests\CombinatoricsCountingTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ComplexTests\Complex32Test.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ComplexTests\Complex32Test.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ComplexTests\ComplexTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ComplexTests\ComplexTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="CombinatoricsTests\CombinatoricsCountingTest.cs" />
+    <Compile Include="ComplexTests\Complex32Test.cs" />
+    <Compile Include="ComplexTests\Complex32Test.TextHandling.cs" />
+    <Compile Include="ComplexTests\ComplexTest.cs" />
+    <Compile Include="ComplexTests\ComplexTest.TextHandling.cs" />
    <Compile Include="DistributionTests\CommonDistributionTests.cs" />
    <Compile Include="DistributionTests\Continuous\BetaTests.cs" />
    <Compile Include="DistributionTests\Continuous\CauchyTests.cs" />
    <Compile Include="DistributionTests\Continuous\ChiSquareTests.cs" />
    <Compile Include="DistributionTests\Continuous\ChiTests.cs" />
    <Compile Include="DistributionTests\Continuous\ContinuousUniformTests.cs" />
-    <Compile Include="DistributionTests\Continuous\ErlangTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DistributionTests\Continuous\ExponentialTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DistributionTests\Continuous\FisherSnedecorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="DistributionTests\Continuous\ErlangTests.cs" />
+    <Compile Include="DistributionTests\Continuous\ExponentialTests.cs" />
+    <Compile Include="DistributionTests\Continuous\FisherSnedecorTests.cs" />
    <Compile Include="DistributionTests\Continuous\GammaTests.cs" />
    <Compile Include="DistributionTests\Continuous\InverseGammaTests.cs" />
    <Compile Include="DistributionTests\Continuous\LaplaceTests.cs" />
@ -147,556 +134,202 @@
    <Compile Include="FitTests.cs" />
    <Compile Include="LinearAlgebraProviderTests\Complex32\LinearAlgebraProviderTests.cs" />
    <Compile Include="LinearAlgebraProviderTests\Complex\LinearAlgebraProviderTests.cs" />
-    <Compile Include="LinearAlgebraProviderTests\Double\LinearAlgebraProviderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraProviderTests\Double\LinearAlgebraProviderTests.cs" />
    <Compile Include="LinearAlgebraProviderTests\Single\LinearAlgebraProviderTests.cs" />
-    <Compile Include="LinearAlgebraTests\Complex32\DenseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex32\DenseMatrixTests.cs" />
    <Compile Include="LinearAlgebraTests\Complex32\DenseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex32\DenseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\DenseVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\DiagonalMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\CholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\EvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\GramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\LUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\QRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\SvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserCholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserEvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserGramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserLUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserQRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserSvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\MatrixLoader.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex32\DenseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\DenseVectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\DiagonalMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\CholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\EvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\GramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\LUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\QRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\SvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserCholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserEvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserGramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserLUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserQRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Factorization\UserSvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\MatrixLoader.cs" />
    <Compile Include="LinearAlgebraTests\Complex32\MatrixStructureTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex32\MatrixTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\MatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\BiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\GpBiCgTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\MlkBiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\TFQMRTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\IteratorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\DiagonalTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\IluptElementSorterTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\IlutpTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\IncompleteLUTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\PreConditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\UnitPreconditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\FailureStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\ResidualStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\SparseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex32\MatrixTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\MatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\BiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\GpBiCgTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\MlkBiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Iterative\TFQMRTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\IteratorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\DiagonalTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\IluptElementSorterTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\IlutpTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\IncompleteLUTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\PreConditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\Preconditioners\UnitPreconditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\FailureStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\Solvers\StopCriterium\ResidualStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\SparseMatrixTests.cs" />
    <Compile Include="LinearAlgebraTests\Complex32\SparseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex32\SparseVectorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\SparseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedMatrix.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex32\SparseVectorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\SparseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedMatrix.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedVector.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\UserDefinedVectorTests.cs" />
    <Compile Include="LinearAlgebraTests\Complex32\VectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex32\VectorTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\VectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex32\VectorTests.Norm.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\DenseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex32\VectorTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\VectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex32\VectorTests.Norm.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\DenseMatrixTests.cs" />
    <Compile Include="LinearAlgebraTests\Complex\DenseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex\DenseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\DenseVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\DiagonalMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\CholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\EvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\GramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\LUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\QRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\SvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserCholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserEvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserGramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserLUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserQRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserSvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\MatrixLoader.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex\DenseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\DenseVectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\DiagonalMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\CholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\EvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\GramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\LUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\QRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\SvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserCholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserEvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserGramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserLUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserQRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Factorization\UserSvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\MatrixLoader.cs" />
    <Compile Include="LinearAlgebraTests\Complex\MatrixStructureTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex\MatrixTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\MatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\BiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\GpBiCgTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\MlkBiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\TFQMRTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\IteratorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\DiagonalTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\IluptElementSorterTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\IlutpTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\IncompleteLUTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\PreConditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\UnitPreconditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\FailureStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\ResidualStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\SparseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex\MatrixTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\MatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\BiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\GpBiCgTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\MlkBiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Iterative\TFQMRTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\IteratorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\DiagonalTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\IluptElementSorterTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\IlutpTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\IncompleteLUTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\PreConditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\Preconditioners\UnitPreconditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\FailureStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\Solvers\StopCriterium\ResidualStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\SparseMatrixTests.cs" />
    <Compile Include="LinearAlgebraTests\Complex\SparseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex\SparseVectorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\SparseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\UserDefinedMatrix.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\UserDefinedMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\UserDefinedVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\UserDefinedVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex\SparseVectorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\SparseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\UserDefinedMatrix.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\UserDefinedMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\UserDefinedVector.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\UserDefinedVectorTests.cs" />
    <Compile Include="LinearAlgebraTests\Complex\VectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Complex\VectorTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\VectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Complex\VectorTests.Norm.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Complex\VectorTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\VectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Complex\VectorTests.Norm.cs" />
    <Compile Include="LinearAlgebraTests\Double\MatrixStructureTheory.cs" />
    <Compile Include="LinearAlgebraTests\Double\SparseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Double\DenseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\DenseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\DenseVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Double\DenseMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\DenseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Double\DenseVectorTests.cs" />
    <Compile Include="LinearAlgebraTests\Double\DenseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Double\DiagonalMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\CholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\EvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\GramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\LUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\QRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\SvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\UserCholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\UserEvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\UserGramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\UserLUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\UserQRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Factorization\UserSvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\MatrixLoader.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\MatrixTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\MatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\BiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\GpBiCgTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\MlkBiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\TFQMRTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\IteratorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\DiagonalTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\IluptElementSorterTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\IlutpTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\IncompleteLUTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\PreConditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\UnitPreconditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\FailureStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\ResidualStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\SparseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\SparseVectorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\SparseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\UserDefinedMatrix.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\UserDefinedMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\UserDefinedVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\UserDefinedVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\VectorTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\VectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Double\VectorTests.Norm.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Double\DiagonalMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\CholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\EvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\GramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\LUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\QRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\SvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\UserCholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\UserEvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\UserGramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\UserLUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\UserQRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Factorization\UserSvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\MatrixLoader.cs" />
+    <Compile Include="LinearAlgebraTests\Double\MatrixTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Double\MatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\BiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\GpBiCgTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\MlkBiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Iterative\TFQMRTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\IteratorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\DiagonalTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\IluptElementSorterTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\IlutpTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\IncompleteLUTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\PreConditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\Preconditioners\UnitPreconditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\FailureStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\Solvers\StopCriterium\ResidualStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\SparseMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\SparseVectorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Double\SparseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Double\UserDefinedMatrix.cs" />
+    <Compile Include="LinearAlgebraTests\Double\UserDefinedMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\UserDefinedVector.cs" />
+    <Compile Include="LinearAlgebraTests\Double\UserDefinedVectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\VectorTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Double\VectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Double\VectorTests.Norm.cs" />
    <Compile Include="LinearAlgebraTests\MatrixStructureTheory.Access.cs" />
    <Compile Include="LinearAlgebraTests\MatrixStructureTheory.cs" />
    <Compile Include="LinearAlgebraTests\MatrixStructureTheory.Reform.cs" />
-    <Compile Include="LinearAlgebraTests\Single\DenseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Single\DenseMatrixTests.cs" />
    <Compile Include="LinearAlgebraTests\Single\DenseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Single\DenseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\DenseVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\DiagonalMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\CholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\EvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\GramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\LUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\QRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\SvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\UserCholeskyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\UserEvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\UserGramSchmidtTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\UserLUTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\UserQRTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Factorization\UserSvdTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\MatrixLoader.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Single\DenseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Single\DenseVectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\DiagonalMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\CholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\EvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\GramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\LUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\QRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\SvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\UserCholeskyTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\UserEvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\UserGramSchmidtTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\UserLUTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\UserQRTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Factorization\UserSvdTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\MatrixLoader.cs" />
    <Compile Include="LinearAlgebraTests\Single\MatrixStructureTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Single\MatrixTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\MatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\BiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\GpBiCgTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\MlkBiCgStabTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\TFQMRTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\IteratorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\DiagonalTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\IluptElementSorterTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\IlutpTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\IncompleteLUTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\PreConditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\UnitPreconditionerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\FailureStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\ResidualStopCriteriumTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\SparseMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Single\MatrixTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Single\MatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\BiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\GpBiCgTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\MlkBiCgStabTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Iterative\TFQMRTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\IteratorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\DiagonalTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\IluptElementSorterTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\IlutpTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\IncompleteLUTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\PreConditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\Preconditioners\UnitPreconditionerTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\DivergenceStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\FailureStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\IterationCountStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\Solvers\StopCriterium\ResidualStopCriteriumTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\SparseMatrixTests.cs" />
    <Compile Include="LinearAlgebraTests\Single\SparseVectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Single\SparseVectorTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\SparseVectorTest.TextHandling.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\UserDefinedMatrix.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\UserDefinedMatrixTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\UserDefinedVector.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\UserDefinedVectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Single\SparseVectorTest.cs" />
+    <Compile Include="LinearAlgebraTests\Single\SparseVectorTest.TextHandling.cs" />
+    <Compile Include="LinearAlgebraTests\Single\UserDefinedMatrix.cs" />
+    <Compile Include="LinearAlgebraTests\Single\UserDefinedMatrixTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\UserDefinedVector.cs" />
+    <Compile Include="LinearAlgebraTests\Single\UserDefinedVectorTests.cs" />
    <Compile Include="LinearAlgebraTests\Single\VectorArithmeticTheory.cs" />
-    <Compile Include="LinearAlgebraTests\Single\VectorTests.Arithmetic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\VectorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="LinearAlgebraTests\Single\VectorTests.Norm.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="LinearAlgebraTests\Single\VectorTests.Arithmetic.cs" />
+    <Compile Include="LinearAlgebraTests\Single\VectorTests.cs" />
+    <Compile Include="LinearAlgebraTests\Single\VectorTests.Norm.cs" />
    <Compile Include="LinearAlgebraTests\Double\VectorArithmeticTheory.cs" />
    <Compile Include="LinearAlgebraTests\StaticDynamicWrapper.cs" />
    <Compile Include="LinearAlgebraTests\VectorArithmeticTheory.cs" />
@ -1041,13 +674,5 @@
  <ItemGroup>
    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
  </ItemGroup>
-  <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>
--- a/src/UnitTests/UnitTestsPortable.csproj
+++ b/src/UnitTests/UnitTestsPortable.csproj
@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0672ED13-CE61-4D3C-B879-282472817235}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MathNet.Numerics.UnitTests</RootNamespace>
+    <AssemblyName>MathNet.Numerics.UnitTests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug47|AnyCPU' ">
+    <DefineConstants>TRACE;DEBUG;PORTABLE</DefineConstants>
+    <AssemblyName>MathNet.Numerics.UnitTests47</AssemblyName>
+    <OutputPath>..\..\out\test\debug\Portable47\</OutputPath>
+    <Optimize>false</Optimize>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release47|AnyCPU' ">
+    <DefineConstants>TRACE;PORTABLE</DefineConstants>
+    <AssemblyName>MathNet.Numerics.UnitTests47</AssemblyName>
+    <OutputPath>..\..\out\test\Portable47\</OutputPath>
+    <DocumentationFile>..\..\out\test\Portable47\MathNet.Numerics.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release136|AnyCPU' ">
+    <DefineConstants>TRACE;PORTABLE;NOSYSNUMERICS</DefineConstants>
+    <AssemblyName>MathNet.Numerics.UnitTests136</AssemblyName>
+    <OutputPath>..\..\out\test\Portable136\</OutputPath>
+    <DocumentationFile>..\..\out\test\Portable136\MathNet.Numerics.XML</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="Properties\Settings.Designer.cs">
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Numerics\Portable.csproj">
+      <Project>{49205185-621e-ffb9-2104-887c9f1bbd13}</Project>
+      <Name>Portable</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\data\Codeplex-5667.csv">
+      <Link>data\Codeplex-5667.csv</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Github-Cureos-1.csv">
+      <Link>data\Github-Cureos-1.csv</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\A.mat">
+      <Link>data\Matlab\A.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\collection-nocompress.mat">
+      <Link>data\Matlab\collection-nocompress.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\collection.mat">
+      <Link>data\Matlab\collection.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\complex.mat">
+      <Link>data\Matlab\complex.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\sparse-large.mat">
+      <Link>data\Matlab\sparse-large.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\sparse-small.mat">
+      <Link>data\Matlab\sparse-small.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\sparse_complex.mat">
+      <Link>data\Matlab\sparse_complex.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\Matlab\v.mat">
+      <Link>data\Matlab\v.mat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\AtmWtAgt.dat">
+      <Link>data\NIST\AtmWtAgt.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Bennett5.dat">
+      <Link>data\NIST\Bennett5.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\BoxBOD.dat">
+      <Link>data\NIST\BoxBOD.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Chwirut1.dat">
+      <Link>data\NIST\Chwirut1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Chwirut2.dat">
+      <Link>data\NIST\Chwirut2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\DanWood.dat">
+      <Link>data\NIST\DanWood.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Eckerle4.dat">
+      <Link>data\NIST\Eckerle4.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\ENSO.dat">
+      <Link>data\NIST\ENSO.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Filip.dat">
+      <Link>data\NIST\Filip.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Gauss1.dat">
+      <Link>data\NIST\Gauss1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Gauss2.dat">
+      <Link>data\NIST\Gauss2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Gauss3.dat">
+      <Link>data\NIST\Gauss3.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Hahn1.dat">
+      <Link>data\NIST\Hahn1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Kirby2.dat">
+      <Link>data\NIST\Kirby2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Lanczos1.dat">
+      <Link>data\NIST\Lanczos1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Lanczos2.dat">
+      <Link>data\NIST\Lanczos2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Lanczos3.dat">
+      <Link>data\NIST\Lanczos3.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Lew.dat">
+      <Link>data\NIST\Lew.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Longley.dat">
+      <Link>data\NIST\Longley.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Lottery.dat">
+      <Link>data\NIST\Lottery.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Mavro.dat">
+      <Link>data\NIST\Mavro.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\MGH09.dat">
+      <Link>data\NIST\MGH09.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\MGH10.dat">
+      <Link>data\NIST\MGH10.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\MGH17.dat">
+      <Link>data\NIST\MGH17.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Michelso.dat">
+      <Link>data\NIST\Michelso.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Misra1a.dat">
+      <Link>data\NIST\Misra1a.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Misra1b.dat">
+      <Link>data\NIST\Misra1b.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Misra1c.dat">
+      <Link>data\NIST\Misra1c.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Misra1d.dat">
+      <Link>data\NIST\Misra1d.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Nelson.dat">
+      <Link>data\NIST\Nelson.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\NoInt1.dat">
+      <Link>data\NIST\NoInt1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\NoInt2.dat">
+      <Link>data\NIST\NoInt2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Norris.dat">
+      <Link>data\NIST\Norris.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\NumAcc1.dat">
+      <Link>data\NIST\NumAcc1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\NumAcc2.dat">
+      <Link>data\NIST\NumAcc2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\NumAcc3.dat">
+      <Link>data\NIST\NumAcc3.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\NumAcc4.dat">
+      <Link>data\NIST\NumAcc4.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Pontius.dat">
+      <Link>data\NIST\Pontius.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Rat42.dat">
+      <Link>data\NIST\Rat42.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Rat43.dat">
+      <Link>data\NIST\Rat43.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Roszman1.dat">
+      <Link>data\NIST\Roszman1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SiRstvt.dat">
+      <Link>data\NIST\SiRstvt.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs01t.dat">
+      <Link>data\NIST\SmLs01t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs02t.dat">
+      <Link>data\NIST\SmLs02t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs03t.dat">
+      <Link>data\NIST\SmLs03t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs04t.dat">
+      <Link>data\NIST\SmLs04t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs05t.dat">
+      <Link>data\NIST\SmLs05t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs06t.dat">
+      <Link>data\NIST\SmLs06t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs07t.dat">
+      <Link>data\NIST\SmLs07t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs08t.dat">
+      <Link>data\NIST\SmLs08t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\SmLs09t.dat">
+      <Link>data\NIST\SmLs09t.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Thurber.dat">
+      <Link>data\NIST\Thurber.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Wampler1.dat">
+      <Link>data\NIST\Wampler1.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Wampler2.dat">
+      <Link>data\NIST\Wampler2.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Wampler3.dat">
+      <Link>data\NIST\Wampler3.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Wampler4.dat">
+      <Link>data\NIST\Wampler4.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\data\NIST\Wampler5.dat">
+      <Link>data\NIST\Wampler5.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="App.config" />
+    <None Include="..\..\data\NIST\Meixner.dat">
+      <Link>data\NIST\Meixner.dat</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/src/UnitTests/UseLinearAlgebraProvider.cs
+++ b/src/UnitTests/UseLinearAlgebraProvider.cs
@ -38,11 +38,13 @@ namespace MathNet.Numerics.UnitTests
    {
        public void BeforeTest(TestDetails testDetails)
        {
+#if NATIVEMKL
            var provider = Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant();
            if (provider.Contains("mkl"))
            {
                Control.LinearAlgebraProvider = new Providers.LinearAlgebra.Mkl.MklLinearAlgebraProvider();
            }
+#endif
        }

        public void AfterTest(TestDetails details)