diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
index 6f5cabb09..1734c48de 100644
--- a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
+++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -10,7 +10,9 @@
 
     <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
     <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
-    <TargetFrameworks>netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <!--<TargetFrameworks>netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>-->
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    
     <LangVersion>7.3</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
index cac4030d5..5da1c3bb7 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
 
             // Compare encoded result
             string path = provider.Utility.GetTestOutputFileName("gif", null, true);
-            using (var encoded = Image.Load(path))
+            using (var encoded = Image.Load<Rgba32>(path))
             {
                 encoded.CompareToReferenceOutput(ValidatorComparer, provider, null, "gif");
             }
@@ -180,7 +180,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
             {
                 inStream.Position = 0;
 
-                var image = Image.Load(inStream);
+                var image = Image.Load<Rgba32>(inStream);
                 GifMetadata metaData = image.Metadata.GetFormatMetadata(GifFormat.Instance);
                 GifFrameMetadata frameMetaData = image.Frames.RootFrame.Metadata.GetFormatMetadata(GifFormat.Instance);
                 GifColorTableMode colorMode = metaData.ColorTableMode;
@@ -194,7 +194,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
                 outStream.Position = 0;
 
                 outStream.Position = 0;
-                var clone = Image.Load(outStream);
+                var clone = Image.Load<Rgba32>(outStream);
 
                 GifMetadata cloneMetaData = clone.Metadata.GetFormatMetadata<GifMetadata>(GifFormat.Instance);
                 Assert.Equal(metaData.ColorTableMode, cloneMetaData.ColorTableMode);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 15f7f92a8..e316fe67e 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -147,8 +147,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             var comparer = ImageComparer.Tolerant(0, 0);
 
             using (Image<TPixel> expectedImage = provider.GetReferenceOutputImage<TPixel>(appendPixelTypeToFileName: false))
-            using (var pdfJsOriginalResult = Image.Load(pdfJsOriginalResultPath))
-            using (var pdfJsPortResult = Image.Load(sourceBytes, JpegDecoder))
+            using (var pdfJsOriginalResult = Image.Load<Rgba32>(pdfJsOriginalResultPath))
+            using (var pdfJsPortResult = Image.Load<Rgba32>(sourceBytes, JpegDecoder))
             {
                 ImageSimilarityReport originalReport = comparer.CompareImagesOrFrames(expectedImage, pdfJsOriginalResult);
                 ImageSimilarityReport portReport = comparer.CompareImagesOrFrames(expectedImage, pdfJsPortResult);
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 0b727f30c..efdf89964 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net462;net472</TargetFrameworks>
+    <!--<TargetFrameworks>netcoreapp2.1;net462;net472</TargetFrameworks>-->
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <DebugType Condition="$(codecov) != ''">full</DebugType>
diff --git a/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs
deleted file mode 100644
index d651f2f04..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class BlackWhiteTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void BlackWhite_CorrectProcessor()
-        {
-            this.operations.BlackWhite();
-            BlackWhiteProcessor<Rgba32> p = this.Verify<BlackWhiteProcessor<Rgba32>>();
-        }
-
-        [Fact]
-        public void BlackWhite_rect_CorrectProcessor()
-        {
-            this.operations.BlackWhite(this.rect);
-            BlackWhiteProcessor<Rgba32> p = this.Verify<BlackWhiteProcessor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs
deleted file mode 100644
index e210450a8..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Effects
-{
-    public class BrightnessTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Brightness_amount_BrightnessProcessorDefaultsSet()
-        {
-            this.operations.Brightness(1.5F);
-            BrightnessProcessor<Rgba32> processor = this.Verify<BrightnessProcessor<Rgba32>>();
-
-            Assert.Equal(1.5F, processor.Amount);
-        }
-
-        [Fact]
-        public void Brightness_amount_rect_BrightnessProcessorDefaultsSet()
-        {
-            this.operations.Brightness(1.5F, this.rect);
-            BrightnessProcessor<Rgba32> processor = this.Verify<BrightnessProcessor<Rgba32>>(this.rect);
-
-            Assert.Equal(1.5F, processor.Amount);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
deleted file mode 100644
index aeafe5fe1..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Collections.Generic;
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.ImageSharp.Tests.TestUtilities;
-
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class ColorBlindnessTest : BaseImageOperationsExtensionTest
-    {
-        public static IEnumerable<object[]> TheoryData = new[] {
-            new object[]{ new TestType<AchromatomalyProcessor<Rgba32>>(), ColorBlindnessMode.Achromatomaly },
-            new object[]{ new TestType<AchromatopsiaProcessor<Rgba32>>(), ColorBlindnessMode.Achromatopsia },
-            new object[]{ new TestType<DeuteranomalyProcessor<Rgba32>>(), ColorBlindnessMode.Deuteranomaly },
-            new object[]{ new TestType<DeuteranopiaProcessor<Rgba32>>(), ColorBlindnessMode.Deuteranopia },
-            new object[]{ new TestType<ProtanomalyProcessor<Rgba32>>(), ColorBlindnessMode.Protanomaly },
-            new object[]{ new TestType<ProtanopiaProcessor<Rgba32>>(), ColorBlindnessMode.Protanopia },
-            new object[]{ new TestType<TritanomalyProcessor<Rgba32>>(), ColorBlindnessMode.Tritanomaly },
-            new object[]{ new TestType<TritanopiaProcessor<Rgba32>>(), ColorBlindnessMode.Tritanopia }
-        };
-
-        [Theory]
-        [MemberData(nameof(TheoryData))]
-        public void ColorBlindness_CorrectProcessor<T>(TestType<T> testType, ColorBlindnessMode colorBlindness)
-            where T : IImageProcessor<Rgba32>
-        {
-            this.operations.ColorBlindness(colorBlindness);
-            T p = this.Verify<T>();
-        }
-        [Theory]
-        [MemberData(nameof(TheoryData))]
-        public void ColorBlindness_rect_CorrectProcessor<T>(TestType<T> testType, ColorBlindnessMode colorBlindness)
-            where T : IImageProcessor<Rgba32>
-        {
-            this.operations.ColorBlindness(colorBlindness, this.rect);
-            T p = this.Verify<T>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs b/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs
deleted file mode 100644
index 21a552e6a..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Effects
-{
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Processors.Filters;
-
-    public class ContrastTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Contrast_amount_ContrastProcessorDefaultsSet()
-        {
-            this.operations.Contrast(1.5F);
-            ContrastProcessor<Rgba32> processor = this.Verify<ContrastProcessor<Rgba32>>();
-
-            Assert.Equal(1.5F, processor.Amount);
-        }
-
-        [Fact]
-        public void Contrast_amount_rect_ContrastProcessorDefaultsSet()
-        {
-            this.operations.Contrast(1.5F, this.rect);
-            ContrastProcessor<Rgba32> processor = this.Verify<ContrastProcessor<Rgba32>>(this.rect);
-
-            Assert.Equal(1.5F, processor.Amount);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
index 414a0d74e..f4efb1274 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
@@ -17,14 +17,14 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters
         public void Filter_CorrectProcessor()
         {
             this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F));
-            FilterProcessor<Rgba32> p = this.Verify<FilterProcessor<Rgba32>>();
+            FilterProcessorImplementation<Rgba32> p = this.Verify<FilterProcessorImplementation<Rgba32>>();
         }
 
         [Fact]
         public void Filter_rect_CorrectProcessor()
         {
             this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F), this.rect);
-            FilterProcessor<Rgba32> p = this.Verify<FilterProcessor<Rgba32>>(this.rect);
+            FilterProcessorImplementation<Rgba32> p = this.Verify<FilterProcessorImplementation<Rgba32>>(this.rect);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs
deleted file mode 100644
index d63d97820..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Collections.Generic;
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.ImageSharp.Tests.TestUtilities;
-
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class GrayscaleTest : BaseImageOperationsExtensionTest
-    {
-        public static IEnumerable<object[]> ModeTheoryData = new[] {
-            new object[]{ new TestType<GrayscaleBt709Processor<Rgba32>>(), GrayscaleMode.Bt709 }
-        };
-
-        [Theory]
-        [MemberData(nameof(ModeTheoryData))]
-        public void Grayscale_mode_CorrectProcessor<T>(TestType<T> testType, GrayscaleMode mode)
-            where T : IImageProcessor<Rgba32>
-        {
-            this.operations.Grayscale(mode);
-            var p = this.Verify<T>();
-        }
-
-        [Theory]
-        [MemberData(nameof(ModeTheoryData))]
-        public void Grayscale_mode_rect_CorrectProcessor<T>(TestType<T> testType, GrayscaleMode mode)
-            where T : IImageProcessor<Rgba32>
-        {
-            this.operations.Grayscale(mode, this.rect);
-            this.Verify<T>(this.rect);
-        }
-
-        [Fact]
-        public void Grayscale_rect_CorrectProcessor()
-        {
-            this.operations.Grayscale(this.rect);
-            this.Verify<GrayscaleBt709Processor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs b/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs
deleted file mode 100644
index f56578dd6..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class HueTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Hue_amount_HueProcessorDefaultsSet()
-        {
-            this.operations.Hue(34f);
-            var processor = this.Verify<HueProcessor<Rgba32>>();
-
-            Assert.Equal(34f, processor.Degrees);
-        }
-
-        [Fact]
-        public void Hue_amount_rect_HueProcessorDefaultsSet()
-        {
-            this.operations.Hue(5f, this.rect);
-            var processor = this.Verify<HueProcessor<Rgba32>>(this.rect);
-
-            Assert.Equal(5f, processor.Degrees);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs
deleted file mode 100644
index c93afc942..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Effects
-{
-    public class InvertTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Invert_InvertProcessorDefaultsSet()
-        {
-            this.operations.Invert();
-            var processor = this.Verify<InvertProcessor<Rgba32>>();
-        }
-
-        [Fact]
-        public void Pixelate_rect_PixelateProcessorDefaultsSet()
-        {
-            this.operations.Invert(this.rect);
-            var processor = this.Verify<InvertProcessor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs
deleted file mode 100644
index a98252140..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class KodachromeTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Kodachrome_amount_KodachromeProcessorDefaultsSet()
-        {
-            this.operations.Kodachrome();
-            var processor = this.Verify<KodachromeProcessor<Rgba32>>();
-        }
-
-        [Fact]
-        public void Kodachrome_amount_rect_KodachromeProcessorDefaultsSet()
-        {
-            this.operations.Kodachrome(this.rect);
-            var processor = this.Verify<KodachromeProcessor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs b/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs
deleted file mode 100644
index c104f8c25..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.IO;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.Primitives;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests
-{
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Processors.Filters;
-
-    public class LomographTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Lomograph_amount_LomographProcessorDefaultsSet()
-        {
-            this.operations.Lomograph();
-            var processor = this.Verify<LomographProcessor<Rgba32>>();
-        }
-
-        [Fact]
-        public void Lomograph_amount_rect_LomographProcessorDefaultsSet()
-        {
-            this.operations.Lomograph(this.rect);
-            var processor = this.Verify<LomographProcessor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs b/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs
deleted file mode 100644
index adbb8cf29..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Effects
-{
-    public class OpacityTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Alpha_amount_AlphaProcessorDefaultsSet()
-        {
-            this.operations.Opacity(0.2f);
-            OpacityProcessor<Rgba32> processor = this.Verify<OpacityProcessor<Rgba32>>();
-
-            Assert.Equal(.2f, processor.Amount);
-        }
-
-        [Fact]
-        public void Alpha_amount_rect_AlphaProcessorDefaultsSet()
-        {
-            this.operations.Opacity(0.6f, this.rect);
-            OpacityProcessor<Rgba32> processor = this.Verify<OpacityProcessor<Rgba32>>(this.rect);
-
-            Assert.Equal(.6f, processor.Amount);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs
deleted file mode 100644
index f28827b71..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class PolaroidTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Polaroid_amount_PolaroidProcessorDefaultsSet()
-        {
-            this.operations.Polaroid();
-            var processor = this.Verify<PolaroidProcessor<Rgba32>>();
-        }
-
-        [Fact]
-        public void Polaroid_amount_rect_PolaroidProcessorDefaultsSet()
-        {
-            this.operations.Polaroid(this.rect);
-            var processor = this.Verify<PolaroidProcessor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs b/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs
deleted file mode 100644
index 4b8e80881..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class SaturateTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Saturation_amount_SaturationProcessorDefaultsSet()
-        {
-            this.operations.Saturate(34);
-            SaturateProcessor<Rgba32> processor = this.Verify<SaturateProcessor<Rgba32>>();
-
-            Assert.Equal(34, processor.Amount);
-        }
-
-        [Fact]
-        public void Saturation_amount_rect_SaturationProcessorDefaultsSet()
-        {
-            this.operations.Saturate(5, this.rect);
-            SaturateProcessor<Rgba32> processor = this.Verify<SaturateProcessor<Rgba32>>(this.rect);
-
-            Assert.Equal(5, processor.Amount);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs
deleted file mode 100644
index 9351c8443..000000000
--- a/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Filters;
-using Xunit;
-
-namespace SixLabors.ImageSharp.Tests.Processing.Filters
-{
-    public class SepiaTest : BaseImageOperationsExtensionTest
-    {
-        [Fact]
-        public void Sepia_amount_SepiaProcessorDefaultsSet()
-        {
-            this.operations.Sepia();
-            var processor = this.Verify<SepiaProcessor<Rgba32>>();
-        }
-
-        [Fact]
-        public void Sepia_amount_rect_SepiaProcessorDefaultsSet()
-        {
-            this.operations.Sepia(this.rect);
-            var processor = this.Verify<SepiaProcessor<Rgba32>>(this.rect);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
index 82d768255..eca1a458b 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             IResampler sampler = KnownResamplers.NearestNeighbor;
 
             this.operations.Pad(width, height);
-            ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
+            ResizeProcessorImplementation<Rgba32> resizeProcessor = this.Verify<ResizeProcessorImplementation<Rgba32>>();
 
             Assert.Equal(width, resizeProcessor.Width);
             Assert.Equal(height, resizeProcessor.Height);
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
index 948c79d8d..01c43a0a4 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             int width = 50;
             int height = 100;
             this.operations.Resize(width, height);
-            ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
+            ResizeProcessorImplementation<Rgba32> resizeProcessor = this.Verify<ResizeProcessorImplementation<Rgba32>>();
 
             Assert.Equal(width, resizeProcessor.Width);
             Assert.Equal(height, resizeProcessor.Height);
@@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             int height = 100;
             IResampler sampler = KnownResamplers.Lanczos3;
             this.operations.Resize(width, height, sampler);
-            ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
+            ResizeProcessorImplementation<Rgba32> resizeProcessor = this.Verify<ResizeProcessorImplementation<Rgba32>>();
 
             Assert.Equal(width, resizeProcessor.Width);
             Assert.Equal(height, resizeProcessor.Height);
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 
             // ReSharper disable once ConditionIsAlwaysTrueOrFalse
             this.operations.Resize(width, height, sampler, compand);
-            ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
+            ResizeProcessorImplementation<Rgba32> resizeProcessor = this.Verify<ResizeProcessorImplementation<Rgba32>>();
 
             Assert.Equal(width, resizeProcessor.Width);
             Assert.Equal(height, resizeProcessor.Height);
@@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             };
 
             this.operations.Resize(resizeOptions);
-            ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
+            ResizeProcessorImplementation<Rgba32> resizeProcessor = this.Verify<ResizeProcessorImplementation<Rgba32>>();
 
             Assert.Equal(width, resizeProcessor.Width);
             Assert.Equal(height, resizeProcessor.Height);