diff --git a/tests/ImageSharp.Tests/TestBase.cs b/tests/ImageSharp.Tests/TestBase.cs
index 8a83746e7b..175bf215c4 100644
--- a/tests/ImageSharp.Tests/TestBase.cs
+++ b/tests/ImageSharp.Tests/TestBase.cs
@@ -7,25 +7,11 @@ namespace ImageSharp.Tests
 {
     using System.IO;
 
-    using ImageSharp.Formats;
-
     /// <summary>
     /// The test base class. Inherit from this class for any image manipulation tests.
     /// </summary>
     public abstract class TestBase
     {
-        /// <summary>
-        /// Initializes static members of the <see cref="TestBase"/> class.
-        /// </summary>
-        static TestBase()
-        {
-            // Register the individual image formats.
-            Bootstrapper.Default.AddImageFormat(new PngFormat());
-            Bootstrapper.Default.AddImageFormat(new JpegFormat());
-            Bootstrapper.Default.AddImageFormat(new BmpFormat());
-            Bootstrapper.Default.AddImageFormat(new GifFormat());
-        }
-
         /// <summary>
         /// Creates the image output directory.
         /// </summary>
diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index 4237fdb514..65f712f72c 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -2,31 +2,56 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
+
 namespace ImageSharp.Tests
 {
-    using System;
     using System.Collections.Concurrent;
     using System.IO;
 
+    using ImageSharp.Formats;
+
+    /// <summary>
+    /// A test image file.
+    /// </summary>
     public class TestFile
     {
-        private static readonly ConcurrentDictionary<string, TestFile> cache = new ConcurrentDictionary<string, TestFile>();
-        private static readonly string FormatsDirectory = GetFormatsDirectory();
+        /// <summary>
+        /// The test file cache.
+        /// </summary>
+        private static readonly ConcurrentDictionary<string, TestFile> Cache = new ConcurrentDictionary<string, TestFile>();
 
-        private static string GetFormatsDirectory()
-        {
-          // Here for code coverage tests.
-          string directory = "TestImages/Formats/";
-          if (Directory.Exists(directory))
-          {
-              return directory;
-          }
-          return "../../../../TestImages/Formats/";
-        }
+        /// <summary>
+        /// The formats directory.
+        /// </summary>
+        private static readonly string FormatsDirectory = GetFormatsDirectory();
 
+        /// <summary>
+        /// The image.
+        /// </summary>
         private readonly Image image;
+
+        /// <summary>
+        /// The file.
+        /// </summary>
         private readonly string file;
 
+        /// <summary>
+        /// Initializes static members of the <see cref="TestFile"/> class.
+        /// </summary>
+        static TestFile()
+        {
+            // Register the individual image formats.
+            // TODO: Is this the best place to do this?
+            Bootstrapper.Default.AddImageFormat(new PngFormat());
+            Bootstrapper.Default.AddImageFormat(new JpegFormat());
+            Bootstrapper.Default.AddImageFormat(new BmpFormat());
+            Bootstrapper.Default.AddImageFormat(new GifFormat());
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestFile"/> class.
+        /// </summary>
+        /// <param name="file">The file.</param>
         private TestFile(string file)
         {
             this.file = file;
@@ -35,50 +60,98 @@ namespace ImageSharp.Tests
             this.image = new Image(this.Bytes);
         }
 
-        public static string GetPath(string file)
-        {
-            return Path.Combine(FormatsDirectory, file);
-        }
+        /// <summary>
+        /// Gets the bytes.
+        /// </summary>
+        public byte[] Bytes { get; }
 
-        public static TestFile Create(string file)
-        {
-            return cache.GetOrAdd(file, (string fileName) =>
-            {
-                return new TestFile(GetPath(file));
-            });
-        }
+        /// <summary>
+        /// The file name.
+        /// </summary>
+        public string FileName => Path.GetFileName(this.file);
 
-        public byte[] Bytes { get; }
+        /// <summary>
+        /// The file name without extension.
+        /// </summary>
+        public string FileNameWithoutExtension => Path.GetFileNameWithoutExtension(this.file);
 
-        public string FileName
+        /// <summary>
+        /// Gets the full qualified path to the file.
+        /// </summary>
+        /// <param name="file">
+        /// The file path.
+        /// </param>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        public static string GetPath(string file)
         {
-            get
-            {
-                return Path.GetFileName(this.file);
-            }
+            return Path.Combine(FormatsDirectory, file);
         }
 
-        public string FileNameWithoutExtension
+        /// <summary>
+        /// Creates a new test file or returns one from the cache.
+        /// </summary>
+        /// <param name="file">The file path.</param>
+        /// <returns>
+        /// The <see cref="TestFile"/>.
+        /// </returns>
+        public static TestFile Create(string file)
         {
-            get
-            {
-                return Path.GetFileNameWithoutExtension(this.file);
-            }
+            return Cache.GetOrAdd(file, (string fileName) => new TestFile(GetPath(file)));
         }
 
+        /// <summary>
+        /// Gets the file name.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
         public string GetFileName(object value)
         {
-            return this.FileNameWithoutExtension + "-" + value + Path.GetExtension(this.file);
+            return $"{this.FileNameWithoutExtension}-{value}{Path.GetExtension(this.file)}";
         }
 
+        /// <summary>
+        /// Gets the file name without extension.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
         public string GetFileNameWithoutExtension(object value)
         {
             return this.FileNameWithoutExtension + "-" + value;
         }
 
+        /// <summary>
+        /// Creates a new image.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Image"/>.
+        /// </returns>
         public Image CreateImage()
         {
             return new Image(this.image);
         }
+
+        /// <summary>
+        /// Gets the correct path to the formats directory.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="string"/>.
+        /// </returns>
+        private static string GetFormatsDirectory()
+        {
+            // Here for code coverage tests.
+            string directory = "TestImages/Formats/";
+            if (Directory.Exists(directory))
+            {
+                return directory;
+            }
+
+            return "../../../../TestImages/Formats/";
+        }
     }
 }