diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BitmapTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
similarity index 89%
rename from tests/ImageSharp.Tests/Formats/Bmp/BitmapTests.cs
rename to tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
index 7579cc86e..497abb7d5 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BitmapTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="BitmapTests.cs" company="James Jackson-South">
+// <copyright file="BmpEncoderTests.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -9,7 +9,7 @@ namespace ImageSharp.Tests
 {
     using Xunit;
 
-    public class BitmapTests : FileTestBase
+    public class BmpEncoderTests : FileTestBase
     {
         public static readonly TheoryData<BmpBitsPerPixel> BitsPerPixel
         = new TheoryData<BmpBitsPerPixel>
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
similarity index 94%
rename from tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs
rename to tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
index e1e3e94b0..b874a1585 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="GifDecoderCoreTests.cs" company="James Jackson-South">
+// <copyright file="GifDecoderTests.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -10,7 +10,7 @@ namespace ImageSharp.Tests
 
     using ImageSharp.Formats;
 
-    public class GifDecoderCoreTests
+    public class GifDecoderTests
     {
         [Fact]
         public void Decode_IgnoreMetadataIsFalse_CommentsAreRead()
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
similarity index 96%
rename from tests/ImageSharp.Tests/Formats/Gif/GifEncoderCoreTests.cs
rename to tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
index 0e8e21780..da1323627 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderCoreTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="GifEncoderCoreTests.cs" company="James Jackson-South">
+// <copyright file="GifEncoderTests.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -10,7 +10,7 @@ namespace ImageSharp.Tests
 
     using ImageSharp.Formats;
 
-    public class GifEncoderCoreTests
+    public class GifEncoderTests
     {
         [Fact]
         public void Encode_IgnoreMetadataIsFalse_CommentsAreWritten()
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs
deleted file mode 100644
index 38d2a455e..000000000
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// <copyright file="JpegDecoderCoreTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    public class JpegDecoderCoreTests
-    {
-      [Fact]
-      public void Decode_IgnoreMetadataIsFalse_ExifProfileIsRead()
-      {
-          var options = new DecoderOptions()
-          {
-              IgnoreMetadata = false
-          };
-
-          TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
-
-          using (Image image = testFile.CreateImage(options))
-          {
-              Assert.NotNull(image.MetaData.ExifProfile);
-          }
-      }
-
-      [Fact]
-      public void Decode_IgnoreMetadataIsTrue_ExifProfileIgnored()
-      {
-          var options = new DecoderOptions()
-          {
-              IgnoreMetadata = true
-          };
-
-          TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
-
-          using (Image image = testFile.CreateImage(options))
-          {
-              Assert.Null(image.MetaData.ExifProfile);
-          }
-      }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 476de95ff..7cb9a7cf2 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -121,5 +121,37 @@ namespace ImageSharp.Tests
                 Assert.Equal(72, image.MetaData.VerticalResolution);
             }
         }
+
+        [Fact]
+        public void Decode_IgnoreMetadataIsFalse_ExifProfileIsRead()
+        {
+            var options = new DecoderOptions()
+            {
+                IgnoreMetadata = false
+            };
+
+            TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
+
+            using (Image image = testFile.CreateImage(options))
+            {
+                Assert.NotNull(image.MetaData.ExifProfile);
+            }
+        }
+
+        [Fact]
+        public void Decode_IgnoreMetadataIsTrue_ExifProfileIgnored()
+        {
+            var options = new DecoderOptions()
+            {
+                IgnoreMetadata = true
+            };
+
+            TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
+
+            using (Image image = testFile.CreateImage(options))
+            {
+                Assert.Null(image.MetaData.ExifProfile);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
similarity index 94%
rename from tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs
rename to tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
index 766172ec6..921530806 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="JpegDecoderCoreTests.cs" company="James Jackson-South">
+// <copyright file="PngDecoderTests.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -10,7 +10,7 @@ namespace ImageSharp.Tests
 
     using ImageSharp.Formats;
 
-    public class PngDecoderCoreTests
+    public class PngDecoderTests
     {
         [Fact]
         public void Decode_IgnoreMetadataIsFalse_TextChunckIsRead()
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
similarity index 91%
rename from tests/ImageSharp.Tests/Formats/Png/PngTests.cs
rename to tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index 5ba00eb4d..49be75139 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="PngTests.cs" company="James Jackson-South">
+// <copyright file="PngEncoderTests.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -10,11 +10,9 @@ namespace ImageSharp.Tests
     using System.IO;
     using System.Threading.Tasks;
 
-    using Formats;
-
     using Xunit;
 
-    public class PngTests : FileTestBase
+    public class PngEncoderTests : FileTestBase
     {
         [Fact]
         public void ImageCanSaveIndexedPng()