diff --git a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
index 07e75acf4..8bc4645ff 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
@@ -9,40 +9,39 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Drawing
 {
-    public class SolidBezierTests : FileTestBase
+    [GroupOutput("Drawing")]
+    public class SolidBezierTests
     {
-        [Fact]
-        public void ImageShouldBeOverlayedByFilledPolygon()
+        [Theory]
+        [WithBlankImages(500, 500, PixelTypes.Rgba32)]
+        public void FilledBezier<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            string path = TestEnvironment.CreateOutputDirectory("Drawing", "FilledBezier");
-            SixLabors.Primitives.PointF[] simplePath = new SixLabors.Primitives.PointF[] {
+            Primitives.PointF[] simplePath = {
                         new Vector2(10, 400),
                         new Vector2(30, 10),
                         new Vector2(240, 30),
                         new Vector2(300, 400)
             };
-            using (Image<Rgba32> image = new Image<Rgba32>(500, 500))
-            {
-                image.Mutate(x => x
-                    .BackgroundColor(Rgba32.Blue)
-                    .Fill(Rgba32.HotPink, new Polygon(new CubicBezierLineSegment(simplePath))));
-                image.Save($"{path}/Simple.png");
-
-                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
-                {
-                    Assert.Equal(Rgba32.HotPink, sourcePixels[150, 300]);
 
-                    //curve points should not be never be set
-                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
+            TPixel blue = NamedColors<TPixel>.Blue;
+            TPixel hotPink = NamedColors<TPixel>.HotPink;
 
-                    // inside shape should not be empty
-                    Assert.Equal(Rgba32.HotPink, sourcePixels[200, 250]);
-                }
+            using (Image<TPixel> image = provider.GetImage())
+            {
+                
+                image.Mutate(x => x
+                    .BackgroundColor(blue)
+                    .Fill(hotPink, new Polygon(new CubicBezierLineSegment(simplePath))));
+                image.DebugSave(provider);
+                image.CompareToReferenceOutput(provider);
             }
         }
 
-        [Fact]
-        public void ImageShouldBeOverlayedByFilledPolygonOpacity()
+        [Theory]
+        [WithBlankImages(500, 500, PixelTypes.Rgba32)]
+        public void OverlayByFilledPolygonOpacity<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             string path = TestEnvironment.CreateOutputDirectory("Drawing", "FilledBezier");
             SixLabors.Primitives.PointF[] simplePath = new SixLabors.Primitives.PointF[] {
@@ -53,27 +52,13 @@ namespace SixLabors.ImageSharp.Tests.Drawing
             };
             Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
-            using (Image<Rgba32> image = new Image<Rgba32>(500, 500))
+            using (var image = provider.GetImage() as Image<Rgba32>)
             {
                 image.Mutate(x => x
                     .BackgroundColor(Rgba32.Blue)
                     .Fill(color, new Polygon(new CubicBezierLineSegment(simplePath))));
-                image.Save($"{path}/Opacity.png");
-
-                //shift background color towards forground color by the opacity amount
-                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
-
-                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
-                {
-                    //top of curve
-                    Assert.Equal(mergedColor, sourcePixels[138, 116]);
-
-                    //curve points should not be never be set
-                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
-
-                    // inside shape should not be empty
-                    Assert.Equal(mergedColor, sourcePixels[200, 250]);
-                }
+                image.DebugSave(provider);
+                image.CompareToReferenceOutput(provider);
             }
         }
     }
diff --git a/tests/Images/External b/tests/Images/External
index b3be1178d..0e1b5fd39 160000
--- a/tests/Images/External
+++ b/tests/Images/External
@@ -1 +1 @@
-Subproject commit b3be1178d4e970efc624181480094e50b0d57a90
+Subproject commit 0e1b5fd3987081c8fbee9d5cf6d74142b942df60