diff --git a/tests/ImageSharp.Tests/Image/ImageRotationTests.cs b/tests/ImageSharp.Tests/Image/ImageRotationTests.cs
index 56cec42192..77c25a4d8e 100644
--- a/tests/ImageSharp.Tests/Image/ImageRotationTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageRotationTests.cs
@@ -45,9 +45,9 @@ namespace ImageSharp.Tests
             TestFile file = TestFile.Create(TestImages.Bmp.Car);
             using (Image<Rgba32> image = Image.Load<Rgba32>(file.FilePath))
             {
-                Size original = image.Bounds.Size;
-                image.Rotate(angle);
-                return (original, image.Bounds.Size);
+                Size original = image.Bounds().Size;
+                image.Mutate(ctx => ctx.Rotate(angle));
+                return (original, image.Bounds().Size);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs
index 209d506615..e0d6ed4840 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.BinaryThreshold(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -42,7 +42,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.BinaryThreshold(value, bounds));
-                     image.DebugSave(provider, value, Extensions.Bmp);
+                     image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs
index edaede58da..6570bc7219 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs
@@ -39,7 +39,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Dither(ditherer));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -54,7 +54,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Dither(ditherer, bounds));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
@@ -68,7 +68,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Dither(diffuser, .5F));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -83,7 +83,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Dither(diffuser, .5F, bounds));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs
index dcc61a629a..e572847ad1 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.BlackWhite());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.BlackWhite(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs
index 59f389cfd8..6a3c341a6f 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs
@@ -33,7 +33,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.ColorBlindness(colorBlindness));
-                image.DebugSave(provider, colorBlindness.ToString(), Extensions.Bmp);
+                image.DebugSave(provider, colorBlindness.ToString());
             }
         }
 
@@ -48,7 +48,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.ColorBlindness(colorBlindness, bounds));
-                image.DebugSave(provider, colorBlindness.ToString(), Extensions.Bmp);
+                image.DebugSave(provider, colorBlindness.ToString());
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs
index 30beb61d07..41d0aa8f28 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Hue(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Hue(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs
index be2464d1d9..bed4954c8a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Kodachrome());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Kodachrome(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs
index 1709995943..8e6d984d8e 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs
@@ -21,7 +21,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Lomograph());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -36,7 +36,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Lomograph(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs
index 367ce04c78..322f6d424f 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Polaroid());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Polaroid(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs
index ba0cc344ee..ced6fceb55 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Saturation(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Saturation(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs
index 5879a8bb76..322925c60b 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Sepia());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Sepia(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs
index 3daa8c9334..cbd32bebd5 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.BoxBlur(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.BoxBlur(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
index 72a3e90231..11c77d7113 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
@@ -35,7 +35,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.DetectEdges(detector));
-                image.DebugSave(provider, detector.ToString(), Extensions.Bmp);
+                image.DebugSave(provider, detector.ToString());
             }
         }
 
@@ -50,7 +50,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.DetectEdges(detector, bounds));
-                image.DebugSave(provider, detector.ToString(), Extensions.Bmp);
+                image.DebugSave(provider, detector.ToString());
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
index 9ccc4e4536..6c4efe4d49 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.GaussianBlur(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.GaussianBlur(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs
index dab576c2b8..9b555c216b 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.GaussianSharpen(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.GaussianSharpen(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs
index a7626f386b..3b6189d17a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Alpha(value));
-                image.DebugSave(provider, value, Extensions.Png);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Alpha(value, bounds));
-                image.DebugSave(provider, value, Extensions.Png);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs
index 70c2844de4..286248e96b 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.BackgroundColor(NamedColors<TPixel>.HotPink));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.BackgroundColor(NamedColors<TPixel>.HotPink, bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs
index 57b7cd8d9f..08a46a9c45 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Brightness(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Brightness(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); ;
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs
index a5423ba937..3339414d44 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Contrast(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Contrast(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs
index 2816cb9258..f146c5ba34 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Invert());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Invert(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
index 0a26cee69b..b2b2748310 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.OilPaint(levels, brushSize));
-                image.DebugSave(provider, string.Join("-", levels, brushSize), Extensions.Bmp);
+                image.DebugSave(provider, string.Join("-", levels, brushSize));
             }
         }
 
@@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.OilPaint(levels, brushSize, bounds));
-                image.DebugSave(provider, string.Join("-", levels, brushSize), Extensions.Bmp);
+                image.DebugSave(provider, string.Join("-", levels, brushSize));
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds, 0.001F);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs
index 92703ca076..34f26a1e16 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Pixelate(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 // Test the neigbouring pixels
                 for (int y = 0; y < image.Height; y += value)
@@ -57,7 +57,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects
                 var bounds = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Pixelate(value, bounds));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
 
                 for (int y = 0; y < image.Height; y++)
                 {
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs
index 3f69ba148c..5c0316392d 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Glow());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -31,7 +31,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Glow(NamedColors<TPixel>.Orange));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -43,7 +43,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Glow(image.Width / 4F));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -58,7 +58,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Glow(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs
index c65b254c00..5d0f593e1a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Vignette());
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -31,7 +31,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Vignette(NamedColors<TPixel>.Orange));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -43,7 +43,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Vignette(image.Width / 4F, image.Height / 4F));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
 
@@ -58,7 +58,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays
                 var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Vignette(bounds));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds);
             }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
index 7ab49bc417..df3b77df9c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
@@ -50,10 +50,10 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 image.MetaData.ExifProfile.SetValue(ExifTag.Orientation, orientation);
 
                 image.Mutate(x => x.RotateFlip(rotateType, flipType));
-                image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "1_before"), Extensions.Bmp);
+                image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "1_before"));
 
                 image.Mutate(x => x.AutoOrient());
-                image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "2_after"), Extensions.Bmp);
+                image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "2_after"));
             }
         }
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
index 951fdee5ec..459cdd7cc5 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Crop(image.Width / 2, image.Height / 2));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs
index 910925e8f3..673ada24c0 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.EntropyCrop(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs
index 9a09645385..6ed299b791 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Pad(image.Width + 50, image.Height + 50));
-                image.DebugSave(provider, null, Extensions.Bmp);
+                image.DebugSave(provider);
 
                 // Check pixels are empty
                 for (int y = 0; y < 25; y++)
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
index 813767edcb..db8063ba3a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
@@ -12,7 +12,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
 
     public class ResizeTests : FileTestBase
     {
-        public static readonly string[] ResizeFiles = { TestImages.Jpeg.Baseline.Calliphora };
+        public static readonly string[] ResizeFiles = { TestImages.Png.CalliphoraPartial };
 
         public static readonly TheoryData<string, IResampler> ReSamplers =
             new TheoryData<string, IResampler>
@@ -33,6 +33,19 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             };
 
         [Theory]
+        [WithFile(TestImages.Gif.Giphy, DefaultPixelType)]
+        public void ResizeShouldApplyToAllFrames<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            using (Image<TPixel> image = provider.GetImage())
+            {
+                image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, true));
+                image.DebugSave(provider, extension: Extensions.Gif);
+            }
+        }
+
+        [Theory]
+        [WithTestPatternImages(nameof(ReSamplers), 100, 100, DefaultPixelType)]
         [WithFileCollection(nameof(ResizeFiles), nameof(ReSamplers), DefaultPixelType)]
         public void ImageShouldResize<TPixel>(TestImageProvider<TPixel> provider, string name, IResampler sampler)
             where TPixel : struct, IPixel<TPixel>
@@ -40,7 +53,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, sampler, true));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -55,7 +68,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 var destRectangle = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2);
 
                 image.Mutate(x => x.Resize(image.Width, image.Height, sampler, sourceRectangle, destRectangle, false));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -67,7 +80,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Resize(image.Width / 3, 0, sampler, false));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -79,7 +92,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Resize(0, image.Height / 3, sampler, false));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -97,7 +110,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -115,7 +128,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -134,7 +147,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -153,7 +166,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -172,7 +185,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -191,7 +204,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
@@ -210,7 +223,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
                 };
 
                 image.Mutate(x => x.Resize(options));
-                image.DebugSave(provider, name, Extensions.Bmp);
+                image.DebugSave(provider, name);
             }
         }
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
index b0cafd114e..b6f6a45206 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
@@ -32,7 +32,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.RotateFlip(rotateType, flipType));
-                image.DebugSave(provider, string.Join("_", rotateType, flipType), Extensions.Bmp);
+                image.DebugSave(provider, string.Join("_", rotateType, flipType));
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
index 74afd02404..7fc864cac9 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
@@ -36,7 +36,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Rotate(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
 
@@ -48,7 +48,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(x => x.Rotate(value));
-                image.DebugSave(provider, value, Extensions.Bmp);
+                image.DebugSave(provider, value);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
index 64f4d4905e..0088975a64 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
@@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms
             using (Image<TPixel> image = provider.GetImage())
             {
                 image.Mutate(i => i.Skew(x, y));
-                image.DebugSave(provider, string.Join("_", x, y), Extensions.Bmp);
+                image.DebugSave(provider, string.Join("_", x, y));
             }
         }
     }