diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs
index 09f2d0d02..11f16769b 100644
--- a/src/Shared/AssemblyInfo.Common.cs
+++ b/src/Shared/AssemblyInfo.Common.cs
@@ -35,4 +35,5 @@ using System.Runtime.CompilerServices;
 
 // Ensure the internals can be tested.
 [assembly: InternalsVisibleTo("ImageSharp.Benchmarks")]
-[assembly: InternalsVisibleTo("ImageSharp.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("ImageSharp.Tests")]
+[assembly: InternalsVisibleTo("ImageSharp.Sandbox46")]
\ No newline at end of file
diff --git a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
index fd7cc5c78..0549a9e92 100644
--- a/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
+++ b/tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,10 +29,16 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.1.1\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -75,49 +82,22 @@
       <HintPath>..\..\src\ImageSharp.Formats.Png\bin\$(Configuration)\net45\ImageSharp.Formats.Png.dll</HintPath>
     </Reference>
     <Reference Include="ImageSharp.Processing">
-      <HintPath>..\..\src\ImageSharp\bin\$(Configuration)\net45\ImageSharp.Processing.dll</HintPath>
+      <HintPath>..\..\src\ImageSharp.Processing\bin\$(Configuration)\net45\ImageSharp.Processing.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\ImageSharp.Tests\Drawing\BeziersTests.cs">
-      <Link>Tests\Drawing\BeziersTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\DrawImageTest.cs">
-      <Link>Tests\Drawing\DrawImageTest.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\DrawPathTests.cs">
-      <Link>Tests\Drawing\DrawPathTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\FillPatternTests.cs">
-      <Link>Tests\Drawing\FillPatternTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\FillSolidBrushTests.cs">
-      <Link>Tests\Drawing\FillSolidBrushTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\LineComplexPolygonTests.cs">
-      <Link>Tests\Drawing\LineComplexPolygonTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\LineTests.cs">
-      <Link>Tests\Drawing\LineTests.cs</Link>
-    </Compile>
     <Compile Include="..\ImageSharp.Tests\Drawing\PolygonTests.cs">
       <Link>Tests\Drawing\PolygonTests.cs</Link>
     </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\RecolorImageTest.cs">
-      <Link>Tests\Drawing\RecolorImageTest.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\SolidBezierTests.cs">
-      <Link>Tests\Drawing\SolidBezierTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\SolidComplexPolygonTests.cs">
-      <Link>Tests\Drawing\SolidComplexPolygonTests.cs</Link>
-    </Compile>
-    <Compile Include="..\ImageSharp.Tests\Drawing\SolidPolygonTests.cs">
-      <Link>Tests\Drawing\SolidPolygonTests.cs</Link>
+    <Compile Include="..\ImageSharp.Tests\FileTestBase.cs">
+      <Link>Tests\FileTestBase.cs</Link>
     </Compile>
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\Block8x8FTests.cs">
       <Link>Tests\Formats\Jpg\Block8x8FTests.cs</Link>
     </Compile>
+    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\JpegTestBase.cs">
+      <Link>Tests\Formats\Jpg\JpegTestBase.cs</Link>
+    </Compile>
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\JpegTests.cs">
       <Link>Tests\Formats\Jpg\JpegTests.cs</Link>
     </Compile>
@@ -127,28 +107,93 @@
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\ReferenceImplementationsTests.cs">
       <Link>Tests\Formats\Jpg\ReferenceImplementationsTests.cs</Link>
     </Compile>
-    <Compile Include="..\ImageSharp.Tests\Formats\Jpg\UtilityTestClassBase.cs">
-      <Link>Tests\Formats\Jpg\UtilityTestClassBase.cs</Link>
-    </Compile>
     <Compile Include="..\ImageSharp.Tests\Formats\Jpg\YCbCrImageTests.cs">
       <Link>Tests\Formats\Jpg\YCbCrImageTests.cs</Link>
     </Compile>
+    <Compile Include="..\ImageSharp.Tests\Image\ImagePropertyTests.cs">
+      <Link>Tests\Image\ImagePropertyTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Image\ImageTests.cs">
+      <Link>Tests\Image\ImageTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\Image\PixelAccessorTests.cs">
+      <Link>Tests\Image\PixelAccessorTests.cs</Link>
+    </Compile>
     <Compile Include="..\ImageSharp.Tests\Processors\Filters\ResizeTests.cs">
       <Link>Tests\Processors\Filters\ResizeTests.cs</Link>
     </Compile>
-    <Compile Include="Sandbox.cs" />
+    <Compile Include="..\ImageSharp.Tests\TestBase.cs">
+      <Link>Tests\TestBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestFile.cs">
+      <Link>Tests\TestFile.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestImages.cs">
+      <Link>Tests\TestImages.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\ImageDataAttributeBase.cs">
+      <Link>Tests\TestUtilities\Attributes\ImageDataAttributeBase.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithBlankImageAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithBlankImageAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithFileAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithFileAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithFileCollectionAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithFileCollectionAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithMemberFactoryAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithMemberFactoryAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Attributes\WithSolidFilledImagesAttribute.cs">
+      <Link>Tests\TestUtilities\Attributes\WithSolidFilledImagesAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Factories\GenericFactory.cs">
+      <Link>Tests\TestUtilities\Factories\GenericFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Factories\ImageFactory.cs">
+      <Link>Tests\TestUtilities\Factories\ImageFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\BlankProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\BlankProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\FileProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\FileProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\LambdaProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\LambdaProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\SolidProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\SolidProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImageProviders\TestImageProvider.cs">
+      <Link>Tests\TestUtilities\ImageProviders\TestImageProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\ImagingTestCaseUtility.cs">
+      <Link>Tests\TestUtilities\ImagingTestCaseUtility.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\MeasureFixture.cs">
+      <Link>Tests\TestUtilities\MeasureFixture.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\PixelTypes.cs">
+      <Link>Tests\TestUtilities\PixelTypes.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Tests\TestImageProviderTests.cs">
+      <Link>Tests\TestUtilities\Tests\TestImageProviderTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\Tests\TestUtilityExtensionsTests.cs">
+      <Link>Tests\TestUtilities\Tests\TestUtilityExtensionsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\ImageSharp.Tests\TestUtilities\TestUtilityExtensions.cs">
+      <Link>Tests\TestUtilities\TestUtilityExtensions.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Tests\Image\" />
-    <Folder Include="Tests\TestUtilities\Attributes\" />
-    <Folder Include="Tests\TestUtilities\Factories\" />
-    <Folder Include="Tests\TestUtilities\ImageProviders\" />
-    <Folder Include="Tests\TestUtilities\Tests\" />
-  </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.
diff --git a/tests/ImageSharp.Sandbox46/Sandbox.cs b/tests/ImageSharp.Sandbox46/Sandbox.cs
deleted file mode 100644
index a92bb342e..000000000
--- a/tests/ImageSharp.Sandbox46/Sandbox.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ImageSharp
-{
-    using Xunit;
-
-    public class Sandbox
-    {
-        [Fact]
-        public void HelloImage()
-        {
-            Image img = new Image(10, 20);
-            Assert.Equal(10, img.Width);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Sandbox46/packages.config b/tests/ImageSharp.Sandbox46/packages.config
index 128826db5..4eced5344 100644
--- a/tests/ImageSharp.Sandbox46/packages.config
+++ b/tests/ImageSharp.Sandbox46/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="System.Numerics.Vectors" version="4.1.1" targetFramework="net461" />
   <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
   <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="net461" />
diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index 61a6a9f64..01d760b68 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -35,7 +35,7 @@ namespace ImageSharp.Tests
         /// The file.
         /// </summary>
         private readonly string file;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TestFile"/> class.
         /// </summary>
@@ -135,7 +135,8 @@ namespace ImageSharp.Tests
             var directories = new[] {
                  "TestImages/Formats/", // Here for code coverage tests.
                   "tests/ImageSharp.Tests/TestImages/Formats/", // from travis/build script
-                  "../../../../TestImages/Formats/" 
+                  "../../../ImageSharp.Tests/TestImages/Formats/", // from Sandbox46
+                  "../../../../TestImages/Formats/"
             };
 
             directories= directories.Select(x => Path.GetFullPath(x)).ToArray();