diff --git a/tests/Drivers/Gd/Analyzers/PixelColorAnalyzerTest.php b/tests/Drivers/Gd/Analyzers/PixelColorAnalyzerTest.php
index f3baef85..8ec5421d 100644
--- a/tests/Drivers/Gd/Analyzers/PixelColorAnalyzerTest.php
+++ b/tests/Drivers/Gd/Analyzers/PixelColorAnalyzerTest.php
@@ -4,28 +4,26 @@ declare(strict_types=1);
 
 namespace Intervention\Image\Tests\Drivers\Gd\Analyzers;
 
-use Intervention\Image\Analyzers\PixelColorsAnalyzer;
-use Intervention\Image\Collection;
+use Intervention\Image\Analyzers\PixelColorAnalyzer;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Tests\TestCase;
 use Intervention\Image\Tests\Traits\CanCreateGdTestImage;
 
 /**
  * @requires extension gd
- * @covers \Intervention\Image\Analyzers\PixelColorsAnalyzer
- * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorsAnalyzer
+ * @covers \Intervention\Image\Analyzers\PixelColorAnalyzer
+ * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorAnalyzer
  */
-class PixelColorsAnalyzerTest extends TestCase
+class PixelColorAnalyzerTest extends TestCase
 {
     use CanCreateGdTestImage;
 
     public function testAnalyze(): void
     {
         $image = $this->readTestImage('tile.png');
-        $analyzer = new PixelColorsAnalyzer(0, 0);
+        $analyzer = new PixelColorAnalyzer(0, 0);
         $result = $analyzer->analyze($image);
-        $this->assertInstanceOf(Collection::class, $result);
-        $this->assertInstanceOf(ColorInterface::class, $result->first());
-        $this->assertEquals('b4e000', $result->first()->toHex());
+        $this->assertInstanceOf(ColorInterface::class, $result);
+        $this->assertEquals('b4e000', $result->toHex());
     }
 }
diff --git a/tests/Drivers/Gd/Analyzers/PixelColorAnalyzer.php b/tests/Drivers/Gd/Analyzers/PixelColorsAnalyzerTest.php
similarity index 53%
rename from tests/Drivers/Gd/Analyzers/PixelColorAnalyzer.php
rename to tests/Drivers/Gd/Analyzers/PixelColorsAnalyzerTest.php
index 8ec5421d..f3baef85 100644
--- a/tests/Drivers/Gd/Analyzers/PixelColorAnalyzer.php
+++ b/tests/Drivers/Gd/Analyzers/PixelColorsAnalyzerTest.php
@@ -4,26 +4,28 @@ declare(strict_types=1);
 
 namespace Intervention\Image\Tests\Drivers\Gd\Analyzers;
 
-use Intervention\Image\Analyzers\PixelColorAnalyzer;
+use Intervention\Image\Analyzers\PixelColorsAnalyzer;
+use Intervention\Image\Collection;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Tests\TestCase;
 use Intervention\Image\Tests\Traits\CanCreateGdTestImage;
 
 /**
  * @requires extension gd
- * @covers \Intervention\Image\Analyzers\PixelColorAnalyzer
- * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorAnalyzer
+ * @covers \Intervention\Image\Analyzers\PixelColorsAnalyzer
+ * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorsAnalyzer
  */
-class PixelColorAnalyzerTest extends TestCase
+class PixelColorsAnalyzerTest extends TestCase
 {
     use CanCreateGdTestImage;
 
     public function testAnalyze(): void
     {
         $image = $this->readTestImage('tile.png');
-        $analyzer = new PixelColorAnalyzer(0, 0);
+        $analyzer = new PixelColorsAnalyzer(0, 0);
         $result = $analyzer->analyze($image);
-        $this->assertInstanceOf(ColorInterface::class, $result);
-        $this->assertEquals('b4e000', $result->toHex());
+        $this->assertInstanceOf(Collection::class, $result);
+        $this->assertInstanceOf(ColorInterface::class, $result->first());
+        $this->assertEquals('b4e000', $result->first()->toHex());
     }
 }
diff --git a/tests/Drivers/Gd/Decoders/SplFileInfoImageDecoder.php b/tests/Drivers/Gd/Decoders/SplFileInfoImageDecoderTest.php
similarity index 100%
rename from tests/Drivers/Gd/Decoders/SplFileInfoImageDecoder.php
rename to tests/Drivers/Gd/Decoders/SplFileInfoImageDecoderTest.php
diff --git a/tests/Drivers/Gd/InputHandlerTest.php b/tests/Drivers/Gd/InputHandlerTest.php
index 664e337b..6561ee54 100644
--- a/tests/Drivers/Gd/InputHandlerTest.php
+++ b/tests/Drivers/Gd/InputHandlerTest.php
@@ -17,7 +17,7 @@ use SplFileInfo;
  * @requires extension gd
  * @covers \Intervention\Image\Drivers\Gd\InputHandler
  */
-class GdInputHandlerTest extends TestCase
+class InputHandlerTest extends TestCase
 {
     public function testHandleEmptyString(): void
     {
diff --git a/tests/Drivers/Gd/Modifiers/DrawEllipseModiferTest.php b/tests/Drivers/Gd/Modifiers/DrawEllipseModifierTest.php
similarity index 100%
rename from tests/Drivers/Gd/Modifiers/DrawEllipseModiferTest.php
rename to tests/Drivers/Gd/Modifiers/DrawEllipseModifierTest.php
diff --git a/tests/Drivers/Gd/Modifiers/DrawLineModiferTest.php b/tests/Drivers/Gd/Modifiers/DrawLineModifierTest.php
similarity index 100%
rename from tests/Drivers/Gd/Modifiers/DrawLineModiferTest.php
rename to tests/Drivers/Gd/Modifiers/DrawLineModifierTest.php
diff --git a/tests/Drivers/Imagick/Analyzers/PixelColorAnalyzerTest.php b/tests/Drivers/Imagick/Analyzers/PixelColorAnalyzerTest.php
index 13eb9baf..21396ab2 100644
--- a/tests/Drivers/Imagick/Analyzers/PixelColorAnalyzerTest.php
+++ b/tests/Drivers/Imagick/Analyzers/PixelColorAnalyzerTest.php
@@ -4,28 +4,26 @@ declare(strict_types=1);
 
 namespace Intervention\Image\Tests\Drivers\Imagick\Analyzers;
 
-use Intervention\Image\Analyzers\PixelColorsAnalyzer;
-use Intervention\Image\Collection;
+use Intervention\Image\Analyzers\PixelColorAnalyzer;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Tests\TestCase;
 use Intervention\Image\Tests\Traits\CanCreateImagickTestImage;
 
 /**
  * @requires extension imagick
- * @covers \Intervention\Image\Analyzers\PixelColorsAnalyzer
- * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorsAnalyzer
+ * @covers \Intervention\Image\Analyzers\PixelColorAnalyzer
+ * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorAnalyzer
  */
-class PixelColorsAnalyzerTest extends TestCase
+class PixelColorAnalyzerTest extends TestCase
 {
     use CanCreateImagickTestImage;
 
     public function testAnalyze(): void
     {
         $image = $this->readTestImage('tile.png');
-        $analyzer = new PixelColorsAnalyzer(0, 0);
+        $analyzer = new PixelColorAnalyzer(0, 0);
         $result = $analyzer->analyze($image);
-        $this->assertInstanceOf(Collection::class, $result);
-        $this->assertInstanceOf(ColorInterface::class, $result->first());
-        $this->assertEquals('b4e000', $result->first()->toHex());
+        $this->assertInstanceOf(ColorInterface::class, $result);
+        $this->assertEquals('b4e000', $result->toHex());
     }
 }
diff --git a/tests/Drivers/Imagick/Analyzers/PixelColorAnalyzer.php b/tests/Drivers/Imagick/Analyzers/PixelColorsAnalyzerTest.php
similarity index 53%
rename from tests/Drivers/Imagick/Analyzers/PixelColorAnalyzer.php
rename to tests/Drivers/Imagick/Analyzers/PixelColorsAnalyzerTest.php
index 21396ab2..13eb9baf 100644
--- a/tests/Drivers/Imagick/Analyzers/PixelColorAnalyzer.php
+++ b/tests/Drivers/Imagick/Analyzers/PixelColorsAnalyzerTest.php
@@ -4,26 +4,28 @@ declare(strict_types=1);
 
 namespace Intervention\Image\Tests\Drivers\Imagick\Analyzers;
 
-use Intervention\Image\Analyzers\PixelColorAnalyzer;
+use Intervention\Image\Analyzers\PixelColorsAnalyzer;
+use Intervention\Image\Collection;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Tests\TestCase;
 use Intervention\Image\Tests\Traits\CanCreateImagickTestImage;
 
 /**
  * @requires extension imagick
- * @covers \Intervention\Image\Analyzers\PixelColorAnalyzer
- * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorAnalyzer
+ * @covers \Intervention\Image\Analyzers\PixelColorsAnalyzer
+ * @covers \Intervention\Image\Drivers\Imagick\Analyzers\PixelColorsAnalyzer
  */
-class PixelColorAnalyzerTest extends TestCase
+class PixelColorsAnalyzerTest extends TestCase
 {
     use CanCreateImagickTestImage;
 
     public function testAnalyze(): void
     {
         $image = $this->readTestImage('tile.png');
-        $analyzer = new PixelColorAnalyzer(0, 0);
+        $analyzer = new PixelColorsAnalyzer(0, 0);
         $result = $analyzer->analyze($image);
-        $this->assertInstanceOf(ColorInterface::class, $result);
-        $this->assertEquals('b4e000', $result->toHex());
+        $this->assertInstanceOf(Collection::class, $result);
+        $this->assertInstanceOf(ColorInterface::class, $result->first());
+        $this->assertEquals('b4e000', $result->first()->toHex());
     }
 }
diff --git a/tests/Drivers/Imagick/Analyzers/ProfileAnalyzerTest.php b/tests/Drivers/Imagick/Analyzers/ProfileAnalyzerTest.php
index 6bee2eba..cb11bd7a 100644
--- a/tests/Drivers/Imagick/Analyzers/ProfileAnalyzerTest.php
+++ b/tests/Drivers/Imagick/Analyzers/ProfileAnalyzerTest.php
@@ -14,7 +14,7 @@ use Intervention\Image\Tests\Traits\CanCreateImagickTestImage;
  * @covers \Intervention\Image\Analyzers\ProfileAnalyzer
  * @covers \Intervention\Image\Drivers\Imagick\Analyzers\ProfileAnalyzer
  */
-class ProfleAnalyzerTest extends TestCase
+class ProfileAnalyzerTest extends TestCase
 {
     use CanCreateImagickTestImage;
 
diff --git a/tests/Drivers/Imagick/Decoders/SplFileInfoDecoderTest.php b/tests/Drivers/Imagick/Decoders/SplFileInfoImageDecoderTest.php
similarity index 100%
rename from tests/Drivers/Imagick/Decoders/SplFileInfoDecoderTest.php
rename to tests/Drivers/Imagick/Decoders/SplFileInfoImageDecoderTest.php
diff --git a/tests/Geometry/Traits/HasBackgroundColor.php b/tests/Geometry/Traits/HasBackgroundColorTest.php
similarity index 100%
rename from tests/Geometry/Traits/HasBackgroundColor.php
rename to tests/Geometry/Traits/HasBackgroundColorTest.php