diff --git a/tests/MailMimeParser/Header/GenericHeaderTest.php b/tests/MailMimeParser/Header/GenericHeaderTest.php
index 3fd40737..17b58f87 100644
--- a/tests/MailMimeParser/Header/GenericHeaderTest.php
+++ b/tests/MailMimeParser/Header/GenericHeaderTest.php
@@ -67,8 +67,8 @@ public function testMultilineMimeParts() : void
 
     /**
      *
-     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumer::isStartToken
-     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumer::isEndToken
+     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService::isStartToken
+     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService::isEndToken
      */
     public function testQuotesMimeAndComments() : void
     {
diff --git a/tests/MailMimeParser/Header/SubjectHeaderTest.php b/tests/MailMimeParser/Header/SubjectHeaderTest.php
index f29def10..fc02ab81 100644
--- a/tests/MailMimeParser/Header/SubjectHeaderTest.php
+++ b/tests/MailMimeParser/Header/SubjectHeaderTest.php
@@ -65,8 +65,8 @@ public function testMultilineMimePartWithParentheses() : void
 
     /**
      *
-     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumer::isStartToken
-     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumer::isEndToken
+     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService::isStartToken
+     * @covers ZBateson\MailMimeParser\Header\Consumer\QuotedStringConsumerService::isEndToken
      */
     public function testQuotesMimeAndComments() : void
     {
diff --git a/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php b/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php
index bbde2d59..076b2421 100644
--- a/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php
+++ b/tests/MailMimeParser/Message/Factory/IMimePartFactoryTest.php
@@ -10,8 +10,8 @@
  *
  * @group IMimePartFactory
  * @group MessagePart
- * @covers ZBateson\MailMimeParser\Parser\Part\IMimePartFactory
- * @covers ZBateson\MailMimeParser\Parser\Part\IMessagePartFactory
+ * @covers ZBateson\MailMimeParser\Message\Factory\IMimePartFactory
+ * @covers ZBateson\MailMimeParser\Message\Factory\IMessagePartFactory
  * @author Zaahid Bateson
  */
 class IMimePartFactoryTest extends TestCase
diff --git a/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php b/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php
index ca15b1dc..4301a8c2 100644
--- a/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php
+++ b/tests/MailMimeParser/Message/Factory/IUUEncodedPartFactoryTest.php
@@ -10,8 +10,8 @@
  *
  * @group IUUEncodedPartFactory
  * @group MessagePart
- * @covers ZBateson\MailMimeParser\Parser\Part\IUUEncodedPartFactory
- * @covers ZBateson\MailMimeParser\Parser\Part\IMessagePartFactory
+ * @covers ZBateson\MailMimeParser\Message\Factory\IUUEncodedPartFactory
+ * @covers ZBateson\MailMimeParser\Message\Factory\IMessagePartFactory
  * @author Zaahid Bateson
  */
 class IUUEncodedPartFactoryTest extends TestCase
diff --git a/tests/MailMimeParser/Message/PartFilterTest.php b/tests/MailMimeParser/Message/PartFilterTest.php
index b364213e..f9b65bfb 100644
--- a/tests/MailMimeParser/Message/PartFilterTest.php
+++ b/tests/MailMimeParser/Message/PartFilterTest.php
@@ -9,7 +9,7 @@
  *
  * @group PartFilter
  * @group Message
- * @covers ZBateson\MailMimeParser\PartFilter
+ * @covers ZBateson\MailMimeParser\Message\PartFilter
  * @author Zaahid Bateson
  */
 class PartFilterTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/HeaderParserServiceTest.php b/tests/MailMimeParser/Parser/HeaderParserServiceTest.php
index ca282283..2c135d82 100644
--- a/tests/MailMimeParser/Parser/HeaderParserServiceTest.php
+++ b/tests/MailMimeParser/Parser/HeaderParserServiceTest.php
@@ -11,7 +11,7 @@
  *
  * @group HeaderParserService
  * @group Parser
- * @covers ZBateson\MailMimeParser\Message\HeaderParserService
+ * @covers ZBateson\MailMimeParser\Parser\HeaderParserService
  * @author Zaahid Bateson
  */
 class HeaderParserServiceTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/MessageParserServiceTest.php b/tests/MailMimeParser/Parser/MessageParserServiceTest.php
index ed1d3da5..608ec481 100644
--- a/tests/MailMimeParser/Parser/MessageParserServiceTest.php
+++ b/tests/MailMimeParser/Parser/MessageParserServiceTest.php
@@ -10,7 +10,7 @@
  *
  * @group MessageParserService
  * @group Parser
- * @covers ZBateson\MailMimeParser\Message\MessageParserService
+ * @covers ZBateson\MailMimeParser\Parser\MessageParserService
  * @author Zaahid Bateson
  */
 class MessageParserServiceTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/MimeParserServiceTest.php b/tests/MailMimeParser/Parser/MimeParserServiceTest.php
index 0bc00c57..c337f8de 100644
--- a/tests/MailMimeParser/Parser/MimeParserServiceTest.php
+++ b/tests/MailMimeParser/Parser/MimeParserServiceTest.php
@@ -11,8 +11,8 @@
  *
  * @group MimeParserService
  * @group Parser
- * @covers ZBateson\MailMimeParser\Message\AbstractParserService
- * @covers ZBateson\MailMimeParser\Message\MimeParserService
+ * @covers ZBateson\MailMimeParser\Parser\AbstractParserService
+ * @covers ZBateson\MailMimeParser\Parser\MimeParserService
  * @author Zaahid Bateson
  */
 class MimeParserServiceTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/NonMimeParserServiceTest.php b/tests/MailMimeParser/Parser/NonMimeParserServiceTest.php
index 00758510..1debfeb1 100644
--- a/tests/MailMimeParser/Parser/NonMimeParserServiceTest.php
+++ b/tests/MailMimeParser/Parser/NonMimeParserServiceTest.php
@@ -11,8 +11,8 @@
  *
  * @group NonMimeParser
  * @group Parser
- * @covers ZBateson\MailMimeParser\Message\AbstractParserService
- * @covers ZBateson\MailMimeParser\Message\NonMimeParserService
+ * @covers ZBateson\MailMimeParser\Parser\AbstractParserService
+ * @covers ZBateson\MailMimeParser\Parser\NonMimeParserService
  * @author Zaahid Bateson
  */
 class NonMimeParserServiceTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyTest.php b/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyTest.php
index 2c5f7dfc..450578ca 100644
--- a/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyTest.php
+++ b/tests/MailMimeParser/Parser/Proxy/ParserMessageProxyTest.php
@@ -9,7 +9,7 @@
  *
  * @group Parser
  * @group ParserMessageProxy
- * @covers ZBateson\MailMimeParser\Parser\Part\ParserMessageProxy
+ * @covers ZBateson\MailMimeParser\Parser\Proxy\ParserMessageProxy
  * @author Zaahid Bateson
  */
 class ParserMessageProxyTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyTest.php b/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyTest.php
index c2473d0c..4fc9e81f 100644
--- a/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyTest.php
+++ b/tests/MailMimeParser/Parser/Proxy/ParserMimePartProxyTest.php
@@ -10,8 +10,8 @@
  *
  * @group Parser
  * @group ParserMimePartProxy
- * @covers ZBateson\MailMimeParser\Parser\Part\ParserMimePartProxy
- * @covers ZBateson\MailMimeParser\Parser\Part\ParserPartProxy
+ * @covers ZBateson\MailMimeParser\Parser\Proxy\ParserMimePartProxy
+ * @covers ZBateson\MailMimeParser\Parser\Proxy\ParserPartProxy
  * @author Zaahid Bateson
  */
 class ParserMimePartProxyTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyTest.php b/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyTest.php
index 52f0ca2e..793c5e0e 100644
--- a/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyTest.php
+++ b/tests/MailMimeParser/Parser/Proxy/ParserNonMimeMessageProxyTest.php
@@ -9,7 +9,7 @@
  *
  * @group Parser
  * @group ParserNonMimeMessageProxy
- * @covers ZBateson\MailMimeParser\Parser\Part\ParserNonMimeMessageProxy
+ * @covers ZBateson\MailMimeParser\Parser\Proxy\ParserNonMimeMessageProxy
  * @author Zaahid Bateson
  */
 class ParserNonMimeMessageProxyTest extends TestCase
diff --git a/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyTest.php b/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyTest.php
index e36537da..b6209a91 100644
--- a/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyTest.php
+++ b/tests/MailMimeParser/Parser/Proxy/ParserUUEncodedPartProxyTest.php
@@ -9,7 +9,7 @@
  *
  * @group Parser
  * @group ParserUUEncodedPartProxy
- * @covers ZBateson\MailMimeParser\Parser\Part\ParserUUEncodedPartProxy
+ * @covers ZBateson\MailMimeParser\Parser\Proxy\ParserUUEncodedPartProxy
  * @author Zaahid Bateson
  */
 class ParserUUEncodedPartProxyTest extends TestCase