diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e55ee3f..ceed41e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
+
+## 4.0.1
+ - Fix wrong classes in tests
+ - Fixed response in case of 404 http error. Respect server error message
+
+## 4.0
+ - SubAccount support @oleksandr-mykhailenko in #886
+ - Requests of behalf of Sub Account
+
 ## 3.6.2
  - Bugfix: TypeError caused by improper use of new self() instead of new static() in base class method
 
diff --git a/src/Exception/HttpClientException.php b/src/Exception/HttpClientException.php
index f073f7ba..be733c0a 100644
--- a/src/Exception/HttpClientException.php
+++ b/src/Exception/HttpClientException.php
@@ -13,6 +13,7 @@
 
 use Mailgun\Exception;
 use Psr\Http\Message\ResponseInterface;
+use Throwable;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -48,7 +49,11 @@ public function __construct(string $message, int $code, ResponseInterface $respo
         }
     }
 
-    public static function badRequest(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function badRequest(ResponseInterface $response): HttpClientException
     {
         $body = $response->getBody()->__toString();
         if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
@@ -63,37 +68,72 @@ public static function badRequest(ResponseInterface $response)
         return new self($message, 400, $response);
     }
 
-    public static function unauthorized(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function unauthorized(ResponseInterface $response): HttpClientException
     {
         return new self('Your credentials are incorrect.', 401, $response);
     }
 
-    public static function requestFailed(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function requestFailed(ResponseInterface $response): HttpClientException
     {
         return new self('Parameters were valid but request failed. Try again.', 402, $response);
     }
 
-    public static function notFound(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function notFound(ResponseInterface $response): HttpClientException
     {
-        return new self('The endpoint you have tried to access does not exist. Check if the domain matches the domain you have configure on Mailgun.', 404, $response);
+        $serverMessage = [];
+        $defaultMessage = 'The endpoint you have tried to access does not exist. Check if the domain matches the domain you have configure on Mailgun.';
+        try {
+            $serverMessage = json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
+        } catch (Throwable $throwable) {
+        }
+
+        return new self($serverMessage['message'] ?? $defaultMessage, 404, $response);
     }
 
-    public static function conflict(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function conflict(ResponseInterface $response): HttpClientException
     {
         return new self('Request conflicts with current state of the target resource.', 409, $response);
     }
 
-    public static function payloadTooLarge(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function payloadTooLarge(ResponseInterface $response): HttpClientException
     {
         return new self('Payload too large, your total attachment size is too big.', 413, $response);
     }
 
-    public static function tooManyRequests(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function tooManyRequests(ResponseInterface $response): HttpClientException
     {
         return new self('Too many requests.', 429, $response);
     }
 
-    public static function forbidden(ResponseInterface $response)
+    /**
+     * @param  ResponseInterface   $response
+     * @return HttpClientException
+     */
+    public static function forbidden(ResponseInterface $response): HttpClientException
     {
         $body = $response->getBody()->__toString();
         if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
@@ -108,16 +148,25 @@ public static function forbidden(ResponseInterface $response)
         return new self($message, 403, $response);
     }
 
+    /**
+     * @return ResponseInterface|null
+     */
     public function getResponse(): ?ResponseInterface
     {
         return $this->response;
     }
 
+    /**
+     * @return array
+     */
     public function getResponseBody(): array
     {
         return $this->responseBody;
     }
 
+    /**
+     * @return int
+     */
     public function getResponseCode(): int
     {
         return $this->responseCode;
diff --git a/src/Exception/HttpServerException.php b/src/Exception/HttpServerException.php
index b0d7c225..49725a4e 100644
--- a/src/Exception/HttpServerException.php
+++ b/src/Exception/HttpServerException.php
@@ -18,17 +18,29 @@
  */
 final class HttpServerException extends \RuntimeException implements Exception
 {
-    public static function serverError(int $httpStatus = 500)
+    /**
+     * @param  int                 $httpStatus
+     * @return HttpServerException
+     */
+    public static function serverError(int $httpStatus = 500): HttpServerException
     {
         return new self('An unexpected error occurred at Mailgun\'s servers. Try again later and contact support if the error still exists.', $httpStatus);
     }
 
-    public static function networkError(\Throwable $previous)
+    /**
+     * @param  \Throwable          $previous
+     * @return HttpServerException
+     */
+    public static function networkError(\Throwable $previous): HttpServerException
     {
         return new self('Mailgun\'s servers are currently unreachable.', 0, $previous);
     }
 
-    public static function unknownHttpResponseCode(int $code)
+    /**
+     * @param  int                 $code
+     * @return HttpServerException
+     */
+    public static function unknownHttpResponseCode(int $code): HttpServerException
     {
         return new self(sprintf('Unknown HTTP response code ("%d") received from the API server', $code));
     }
diff --git a/tests/Model/BaseModelTest.php b/tests/Model/BaseModel.php
similarity index 85%
rename from tests/Model/BaseModelTest.php
rename to tests/Model/BaseModel.php
index 79808c73..d4a571a4 100644
--- a/tests/Model/BaseModelTest.php
+++ b/tests/Model/BaseModel.php
@@ -13,6 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-abstract class BaseModelTest extends TestCase
+abstract class BaseModel extends TestCase
 {
 }
diff --git a/tests/Model/Domain/OpenTrackingTest.php b/tests/Model/Domain/ClickTracking.php
similarity index 65%
rename from tests/Model/Domain/OpenTrackingTest.php
rename to tests/Model/Domain/ClickTracking.php
index fbd864fe..89f4ec81 100644
--- a/tests/Model/Domain/OpenTrackingTest.php
+++ b/tests/Model/Domain/ClickTracking.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\OpenTracking;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\ClickTracking as ClickTrackingAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class OpenTrackingTest extends BaseModelTest
+class ClickTracking extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
     "active": true
 }
 JSON;
-        $model = OpenTracking::create(json_decode($json, true));
+        $model = ClickTrackingAlias::create(json_decode($json, true));
         $this->assertTrue($model->isActive());
     }
 }
diff --git a/tests/Model/Domain/ConnectionResponseTest.php b/tests/Model/Domain/ConnectionResponse.php
similarity index 69%
rename from tests/Model/Domain/ConnectionResponseTest.php
rename to tests/Model/Domain/ConnectionResponse.php
index d6261d38..3f94c2a1 100644
--- a/tests/Model/Domain/ConnectionResponseTest.php
+++ b/tests/Model/Domain/ConnectionResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\ConnectionResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\ConnectionResponse as ConnectionResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ConnectionResponseTest extends BaseModelTest
+class ConnectionResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = ConnectionResponse::create(json_decode($json, true));
+        $model = ConnectionResponseAlias::create(json_decode($json, true));
         $this->assertFalse($model->getRequireTLS());
         $this->assertFalse($model->getSkipVerification());
     }
diff --git a/tests/Model/Domain/CreateCredentialResponseTest.php b/tests/Model/Domain/CreateCredentialResponse.php
similarity index 63%
rename from tests/Model/Domain/CreateCredentialResponseTest.php
rename to tests/Model/Domain/CreateCredentialResponse.php
index 16efe50b..e40157f6 100644
--- a/tests/Model/Domain/CreateCredentialResponseTest.php
+++ b/tests/Model/Domain/CreateCredentialResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\CreateCredentialResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\CreateCredentialResponse as CreateCredentialResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CreateCredentialResponseTest extends BaseModelTest
+class CreateCredentialResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
   "message": "Created 1 credentials pair(s)"
 }
 JSON;
-        $model = CreateCredentialResponse::create(json_decode($json, true));
+        $model = CreateCredentialResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
     }
 }
diff --git a/tests/Model/Domain/CreateResponseTest.php b/tests/Model/Domain/CreateResponse.php
similarity index 88%
rename from tests/Model/Domain/CreateResponseTest.php
rename to tests/Model/Domain/CreateResponse.php
index 23271708..616d480e 100644
--- a/tests/Model/Domain/CreateResponseTest.php
+++ b/tests/Model/Domain/CreateResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\CreateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\CreateResponse as CreateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CreateResponseTest extends BaseModelTest
+class CreateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -68,7 +68,7 @@ public function testCreate()
 }
 
 JSON;
-        $model = CreateResponse::create(json_decode($json, true));
+        $model = CreateResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
         $this->assertNotEmpty($model->getDomain());
         $this->assertNotEmpty($model->getInboundDNSRecords());
diff --git a/tests/Model/Domain/CredentialResponseTest.php b/tests/Model/Domain/CredentialResponse.php
similarity index 78%
rename from tests/Model/Domain/CredentialResponseTest.php
rename to tests/Model/Domain/CredentialResponse.php
index 2278cce0..8287838d 100644
--- a/tests/Model/Domain/CredentialResponseTest.php
+++ b/tests/Model/Domain/CredentialResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\CredentialResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\CredentialResponse as CredentialResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CredentialResponseTest extends BaseModelTest
+class CredentialResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -38,7 +38,7 @@ public function testCreate()
   ]
 }
 JSON;
-        $model = CredentialResponse::create(json_decode($json, true));
+        $model = CredentialResponseAlias::create(json_decode($json, true));
         $this->assertEquals(2, $model->getTotalCount());
         $this->assertCount(2, $model->getCredentials());
     }
diff --git a/tests/Model/Domain/CredentialResponseItemTest.php b/tests/Model/Domain/CredentialResponseItem.php
similarity index 75%
rename from tests/Model/Domain/CredentialResponseItemTest.php
rename to tests/Model/Domain/CredentialResponseItem.php
index fae57c94..919839fb 100644
--- a/tests/Model/Domain/CredentialResponseItemTest.php
+++ b/tests/Model/Domain/CredentialResponseItem.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\CredentialResponseItem;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\CredentialResponseItem as CredentialResponseItemAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CredentialResponseItemTest extends BaseModelTest
+class CredentialResponseItem extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
   "login": "user"
 }
 JSON;
-        $model = CredentialResponseItem::create(json_decode($json, true));
+        $model = CredentialResponseItemAlias::create(json_decode($json, true));
         $this->assertEquals('user', $model->getLogin());
         $this->assertEquals('user@samples.mailgun.org', $model->getMailbox());
         $this->assertEquals('5', $model->getSizeBytes());
diff --git a/tests/Model/Domain/DeleteCredentialResponseTest.php b/tests/Model/Domain/DeleteCredentialResponse.php
similarity index 69%
rename from tests/Model/Domain/DeleteCredentialResponseTest.php
rename to tests/Model/Domain/DeleteCredentialResponse.php
index b5e37750..ffa9a12d 100644
--- a/tests/Model/Domain/DeleteCredentialResponseTest.php
+++ b/tests/Model/Domain/DeleteCredentialResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\DeleteCredentialResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\DeleteCredentialResponse as DeleteCredentialResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeleteCredentialResponseTest extends BaseModelTest
+class DeleteCredentialResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -26,7 +26,7 @@ public function testCreate()
 }
 
 JSON;
-        $model = DeleteCredentialResponse::create(json_decode($json, true));
+        $model = DeleteCredentialResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
         $this->assertEmpty($model->getError());
         $this->assertNotEmpty($model->getSpec());
diff --git a/tests/Model/Domain/DeleteResponseTest.php b/tests/Model/Domain/DeleteResponse.php
similarity index 66%
rename from tests/Model/Domain/DeleteResponseTest.php
rename to tests/Model/Domain/DeleteResponse.php
index df1d12a1..c3a6309d 100644
--- a/tests/Model/Domain/DeleteResponseTest.php
+++ b/tests/Model/Domain/DeleteResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\DeleteResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\DeleteResponse as DeleteResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeleteResponseTest extends BaseModelTest
+class DeleteResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
   "message": "Domain has been deleted"
 }
 JSON;
-        $model = DeleteResponse::create(json_decode($json, true));
+        $model = DeleteResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
     }
 }
diff --git a/tests/Model/Domain/DnsRecordTest.php b/tests/Model/Domain/DnsRecord.php
similarity index 78%
rename from tests/Model/Domain/DnsRecordTest.php
rename to tests/Model/Domain/DnsRecord.php
index 78cb7786..70f8e9b6 100644
--- a/tests/Model/Domain/DnsRecordTest.php
+++ b/tests/Model/Domain/DnsRecord.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\DnsRecord;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\DnsRecord as DnsRecordAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DnsRecordTest extends BaseModelTest
+class DnsRecord extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
   "value": "v=spf1 include:mailgun.org ~all"
 }
 JSON;
-        $model = DnsRecord::create(json_decode($json, true));
+        $model = DnsRecordAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getType());
         $this->assertNotEmpty($model->getValidity());
         $this->assertTrue($model->isValid());
diff --git a/tests/Model/Domain/DomainTest.php b/tests/Model/Domain/Domain.php
similarity index 84%
rename from tests/Model/Domain/DomainTest.php
rename to tests/Model/Domain/Domain.php
index cd0dd873..5b1f2e39 100644
--- a/tests/Model/Domain/DomainTest.php
+++ b/tests/Model/Domain/Domain.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\Domain;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\Domain as DomainAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DomainTest extends BaseModelTest
+class Domain extends BaseModel
 {
     public function testCreate()
     {
@@ -30,7 +30,7 @@ public function testCreate()
     "state": "active"
 }
 JSON;
-        $model = Domain::create(json_decode($json, true));
+        $model = DomainAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getName());
         $this->assertNotEmpty($model->getCreatedAt());
         $this->assertFalse($model->isWildcard());
diff --git a/tests/Model/Domain/IndexResponseTest.php b/tests/Model/Domain/IndexResponse.php
similarity index 78%
rename from tests/Model/Domain/IndexResponseTest.php
rename to tests/Model/Domain/IndexResponse.php
index c230ef80..76083af0 100644
--- a/tests/Model/Domain/IndexResponseTest.php
+++ b/tests/Model/Domain/IndexResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\IndexResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\IndexResponse as IndexResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -36,7 +36,7 @@ public function testCreate()
 }
 
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
         $this->assertEquals(1, $model->getTotalCount());
         $this->assertCount(1, $model->getDomains());
     }
diff --git a/tests/Model/Domain/ClickTrackingTest.php b/tests/Model/Domain/OpenTracking.php
similarity index 66%
rename from tests/Model/Domain/ClickTrackingTest.php
rename to tests/Model/Domain/OpenTracking.php
index 4007ffbc..acdb801f 100644
--- a/tests/Model/Domain/ClickTrackingTest.php
+++ b/tests/Model/Domain/OpenTracking.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\ClickTracking;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\OpenTracking as OpenTrackingAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ClickTrackingTest extends BaseModelTest
+class OpenTracking extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
     "active": true
 }
 JSON;
-        $model = ClickTracking::create(json_decode($json, true));
+        $model = OpenTrackingAlias::create(json_decode($json, true));
         $this->assertTrue($model->isActive());
     }
 }
diff --git a/tests/Model/Domain/ShowResponseTest.php b/tests/Model/Domain/ShowResponse.php
similarity index 88%
rename from tests/Model/Domain/ShowResponseTest.php
rename to tests/Model/Domain/ShowResponse.php
index 6619bc9a..1455fa65 100644
--- a/tests/Model/Domain/ShowResponseTest.php
+++ b/tests/Model/Domain/ShowResponse.php
@@ -12,10 +12,10 @@
 namespace Mailgun\Tests\Model\Domain;
 
 use Mailgun\Model\Domain\Domain;
-use Mailgun\Model\Domain\ShowResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\ShowResponse as ShowResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ShowResponseTest extends BaseModelTest
+class ShowResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -67,7 +67,7 @@ public function testCreate()
   ]
 }
 JSON;
-        $model = ShowResponse::create(json_decode($json, true));
+        $model = ShowResponseAlias::create(json_decode($json, true));
         $this->assertCount(2, $model->getInboundDNSRecords());
         $this->assertCount(3, $model->getOutboundDNSRecords());
         $this->assertInstanceOf(Domain::class, $model->getDomain());
diff --git a/tests/Model/Domain/TrackingResponseTest.php b/tests/Model/Domain/TrackingResponse.php
similarity index 89%
rename from tests/Model/Domain/TrackingResponseTest.php
rename to tests/Model/Domain/TrackingResponse.php
index 46d66fdf..cc99bbfa 100644
--- a/tests/Model/Domain/TrackingResponseTest.php
+++ b/tests/Model/Domain/TrackingResponse.php
@@ -13,11 +13,11 @@
 
 use Mailgun\Model\Domain\ClickTracking;
 use Mailgun\Model\Domain\OpenTracking;
-use Mailgun\Model\Domain\TrackingResponse;
+use Mailgun\Model\Domain\TrackingResponse as TrackingResponseAlias;
 use Mailgun\Model\Domain\UnsubscribeTracking;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class TrackingResponseTest extends BaseModelTest
+class TrackingResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -39,7 +39,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = TrackingResponse::create(json_decode($json, true));
+        $model = TrackingResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getClick());
         $this->assertInstanceOf(ClickTracking::class, $model->getClick());
         $this->assertEquals('htmlonly', $model->getClick()->getActive());
diff --git a/tests/Model/Domain/UnsubscribeTrackingTest.php b/tests/Model/Domain/UnsubscribeTracking.php
similarity index 72%
rename from tests/Model/Domain/UnsubscribeTrackingTest.php
rename to tests/Model/Domain/UnsubscribeTracking.php
index 251f0305..4358960c 100644
--- a/tests/Model/Domain/UnsubscribeTrackingTest.php
+++ b/tests/Model/Domain/UnsubscribeTracking.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\UnsubscribeTracking;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\UnsubscribeTracking as UnsubscribeTrackingAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UnsubscribeTrackingTest extends BaseModelTest
+class UnsubscribeTracking extends BaseModel
 {
     public function testCreate()
     {
@@ -26,7 +26,7 @@ public function testCreate()
     "text_footer": "Test"
 }
 JSON;
-        $model = UnsubscribeTracking::create(json_decode($json, true));
+        $model = UnsubscribeTrackingAlias::create(json_decode($json, true));
         $this->assertTrue($model->isActive());
         $this->assertEquals('<s>Test</s>', $model->getHtmlFooter());
         $this->assertEquals('Test', $model->getTextFooter());
diff --git a/tests/Model/Domain/UpdateClickTrackingResponseTest.php b/tests/Model/Domain/UpdateClickTrackingResponse.php
similarity index 77%
rename from tests/Model/Domain/UpdateClickTrackingResponseTest.php
rename to tests/Model/Domain/UpdateClickTrackingResponse.php
index 335b6cc3..addc2827 100644
--- a/tests/Model/Domain/UpdateClickTrackingResponseTest.php
+++ b/tests/Model/Domain/UpdateClickTrackingResponse.php
@@ -12,10 +12,10 @@
 namespace Mailgun\Tests\Model\Domain;
 
 use Mailgun\Model\Domain\ClickTracking;
-use Mailgun\Model\Domain\UpdateClickTrackingResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\UpdateClickTrackingResponse as UpdateClickTrackingResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateClickTrackingResponseTest extends BaseModelTest
+class UpdateClickTrackingResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -28,7 +28,7 @@ public function testCreate()
   "message": "Domain tracking settings have been updated"
 }
 JSON;
-        $model = UpdateClickTrackingResponse::create(json_decode($json, true));
+        $model = UpdateClickTrackingResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
         $this->assertEquals('Domain tracking settings have been updated', $model->getMessage());
         $this->assertNotEmpty($model->getClick());
diff --git a/tests/Model/Domain/UpdateConnectionResponseTest.php b/tests/Model/Domain/UpdateConnectionResponse.php
similarity index 72%
rename from tests/Model/Domain/UpdateConnectionResponseTest.php
rename to tests/Model/Domain/UpdateConnectionResponse.php
index a2c29015..554f5373 100644
--- a/tests/Model/Domain/UpdateConnectionResponseTest.php
+++ b/tests/Model/Domain/UpdateConnectionResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\UpdateConnectionResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\UpdateConnectionResponse as UpdateConnectionResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateConnectionResponseTest extends BaseModelTest
+class UpdateConnectionResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -26,7 +26,7 @@ public function testCreate()
   "skip-verification": false
 }
 JSON;
-        $model = UpdateConnectionResponse::create(json_decode($json, true));
+        $model = UpdateConnectionResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
         $this->assertTrue($model->getRequireTLS());
         $this->assertFalse($model->getSkipVerification());
diff --git a/tests/Model/Domain/UpdateCredentialResponseTest.php b/tests/Model/Domain/UpdateCredentialResponse.php
similarity index 62%
rename from tests/Model/Domain/UpdateCredentialResponseTest.php
rename to tests/Model/Domain/UpdateCredentialResponse.php
index e7d30cfa..754e03d2 100644
--- a/tests/Model/Domain/UpdateCredentialResponseTest.php
+++ b/tests/Model/Domain/UpdateCredentialResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\UpdateCredentialResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\UpdateCredentialResponse as UpdateCredentialResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateCredentialResponseTest extends BaseModelTest
+class UpdateCredentialResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
   "message": "Password changed"
 }
 JSON;
-        $model = UpdateCredentialResponse::create(json_decode($json, true));
+        $model = UpdateCredentialResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
     }
 }
diff --git a/tests/Model/Domain/UpdateOpenTrackingResponseTest.php b/tests/Model/Domain/UpdateOpenTrackingResponse.php
similarity index 75%
rename from tests/Model/Domain/UpdateOpenTrackingResponseTest.php
rename to tests/Model/Domain/UpdateOpenTrackingResponse.php
index 5dd86688..c04b63a9 100644
--- a/tests/Model/Domain/UpdateOpenTrackingResponseTest.php
+++ b/tests/Model/Domain/UpdateOpenTrackingResponse.php
@@ -12,10 +12,10 @@
 namespace Mailgun\Tests\Model\Domain;
 
 use Mailgun\Model\Domain\OpenTracking;
-use Mailgun\Model\Domain\UpdateOpenTrackingResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\UpdateOpenTrackingResponse as UpdateOpenTrackingResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateOpenTrackingResponseTest extends BaseModelTest
+class UpdateOpenTrackingResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -28,7 +28,7 @@ public function testCreate()
   "message": "Domain tracking settings have been updated"
 }
 JSON;
-        $model = UpdateOpenTrackingResponse::create(json_decode($json, true));
+        $model = UpdateOpenTrackingResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
         $this->assertEquals('Domain tracking settings have been updated', $model->getMessage());
         $this->assertNotEmpty($model->getOpen());
diff --git a/tests/Model/Domain/UpdateUnsubscribeTrackingResponseTest.php b/tests/Model/Domain/UpdateUnsubscribeTrackingResponse.php
similarity index 78%
rename from tests/Model/Domain/UpdateUnsubscribeTrackingResponseTest.php
rename to tests/Model/Domain/UpdateUnsubscribeTrackingResponse.php
index 6bce007b..891876b2 100644
--- a/tests/Model/Domain/UpdateUnsubscribeTrackingResponseTest.php
+++ b/tests/Model/Domain/UpdateUnsubscribeTrackingResponse.php
@@ -12,10 +12,10 @@
 namespace Mailgun\Tests\Model\Domain;
 
 use Mailgun\Model\Domain\UnsubscribeTracking;
-use Mailgun\Model\Domain\UpdateUnsubscribeTrackingResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\UpdateUnsubscribeTrackingResponse as UpdateUnsubscribeTrackingResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateUnsubscribeTrackingResponseTest extends BaseModelTest
+class UpdateUnsubscribeTrackingResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -30,7 +30,7 @@ public function testCreate()
   "message": "Domain tracking settings have been updated"
 }
 JSON;
-        $model = UpdateUnsubscribeTrackingResponse::create(json_decode($json, true));
+        $model = UpdateUnsubscribeTrackingResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getMessage());
         $this->assertEquals('Domain tracking settings have been updated', $model->getMessage());
         $this->assertNotEmpty($model->getUnsubscribe());
diff --git a/tests/Model/Domain/VerifyResponseTest.php b/tests/Model/Domain/VerifyResponse.php
similarity index 86%
rename from tests/Model/Domain/VerifyResponseTest.php
rename to tests/Model/Domain/VerifyResponse.php
index da995a9d..1f8977c7 100644
--- a/tests/Model/Domain/VerifyResponseTest.php
+++ b/tests/Model/Domain/VerifyResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Domain;
 
-use Mailgun\Model\Domain\VerifyResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Domain\VerifyResponse as VerifyResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class VerifyResponseTest extends BaseModelTest
+class VerifyResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -66,7 +66,7 @@ public function testCreate()
   ]
 }
 JSON;
-        $model = VerifyResponse::create(json_decode($json, true));
+        $model = VerifyResponseAlias::create(json_decode($json, true));
         $this->assertNull($model->getMessage());
     }
 }
diff --git a/tests/Model/EmailValidation/ParseResponseTest.php b/tests/Model/EmailValidation/ParseResponse.php
similarity index 79%
rename from tests/Model/EmailValidation/ParseResponseTest.php
rename to tests/Model/EmailValidation/ParseResponse.php
index 8840a8d5..a807af07 100644
--- a/tests/Model/EmailValidation/ParseResponseTest.php
+++ b/tests/Model/EmailValidation/ParseResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\EmailValidation;
 
-use Mailgun\Model\EmailValidation\ParseResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\EmailValidation\ParseResponse as ParseResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ParseResponseTest extends BaseModelTest
+class ParseResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -29,7 +29,7 @@ public function testCreate()
     ]
 }
 JSON;
-        $model = ParseResponse::create(json_decode($json, true));
+        $model = ParseResponseAlias::create(json_decode($json, true));
         $this->assertNotEmpty($model->getParsed());
         $this->assertCount(2, $model->getParsed());
         $this->assertEmpty($model->getUnparseable());
@@ -42,7 +42,7 @@ public function testParseConstructorWithValidData()
             'unparseable' => ['unparseable data'],
         ];
 
-        $parts = ParseResponse::create($data);
+        $parts = ParseResponseAlias::create($data);
 
         $this->assertEquals($data['parsed'], $parts->getParsed());
         $this->assertEquals($data['unparseable'], $parts->getUnparseable());
@@ -55,7 +55,7 @@ public function testParseConstructorWithInvalidData()
             'unparseable' => null,
         ];
 
-        $parts = ParseResponse::create($data);
+        $parts = ParseResponseAlias::create($data);
 
         $this->assertEquals([], $parts->getParsed());
         $this->assertEquals([], $parts->getUnparseable());
diff --git a/tests/Model/EmailValidation/PartsTest.php b/tests/Model/EmailValidation/Parts.php
similarity index 80%
rename from tests/Model/EmailValidation/PartsTest.php
rename to tests/Model/EmailValidation/Parts.php
index abcc0a5c..623d7e97 100644
--- a/tests/Model/EmailValidation/PartsTest.php
+++ b/tests/Model/EmailValidation/Parts.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\EmailValidation;
 
-use Mailgun\Model\EmailValidation\Parts;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\EmailValidation\Parts as PartsAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class PartsTest extends BaseModelTest
+class Parts extends BaseModel
 {
     public function testPartsConstructor()
     {
@@ -24,7 +24,7 @@ public function testPartsConstructor()
             'local_part' => 'Local Part',
         ];
 
-        $parts = Parts::create($data);
+        $parts = PartsAlias::create($data);
 
         $this->assertEquals($data['display_name'], $parts->getDisplayName());
         $this->assertEquals($data['domain'], $parts->getDomain());
diff --git a/tests/Model/EmailValidation/ValidateResponseTest.php b/tests/Model/EmailValidation/ValidateResponse.php
similarity index 86%
rename from tests/Model/EmailValidation/ValidateResponseTest.php
rename to tests/Model/EmailValidation/ValidateResponse.php
index d5aa6bfd..eaa9129d 100644
--- a/tests/Model/EmailValidation/ValidateResponseTest.php
+++ b/tests/Model/EmailValidation/ValidateResponse.php
@@ -12,10 +12,10 @@
 namespace Mailgun\Tests\Model\EmailValidation;
 
 use Mailgun\Model\EmailValidation\Parts;
-use Mailgun\Model\EmailValidation\ValidateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\EmailValidation\ValidateResponse as ValidateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidateResponseTest extends BaseModelTest
+class ValidateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -35,7 +35,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = ValidateResponse::create(json_decode($json, true));
+        $model = ValidateResponseAlias::create(json_decode($json, true));
         $this->assertTrue($model->isMailboxVerification());
     }
 
@@ -58,7 +58,7 @@ public function testCreateWithoutMailboxVerification()
   "reason": null
 }
 JSON;
-        $model = ValidateResponse::create(json_decode($json, true));
+        $model = ValidateResponseAlias::create(json_decode($json, true));
         $this->assertFalse($model->isMailboxVerification());
     }
 
@@ -75,7 +75,7 @@ public function testEmailValidation()
             'reason' => null,
         ];
 
-        $parts = ValidateResponse::create($data);
+        $parts = ValidateResponseAlias::create($data);
 
         $this->assertEquals($data['address'], $parts->getAddress());
         $this->assertEquals($data['did_you_mean'], $parts->getDidYouMean());
diff --git a/tests/Model/EmailValidationV4/JobTest.php b/tests/Model/EmailValidationV4/Job.php
similarity index 87%
rename from tests/Model/EmailValidationV4/JobTest.php
rename to tests/Model/EmailValidationV4/Job.php
index 3a372832..967c96a7 100755
--- a/tests/Model/EmailValidationV4/JobTest.php
+++ b/tests/Model/EmailValidationV4/Job.php
@@ -9,14 +9,14 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-namespace Mailgun\Tests\Model\Event;
+namespace Mailgun\Tests\Model\EmailValidationV4;
 
-use Mailgun\Model\EmailValidationV4\Job;
+use Mailgun\Model\EmailValidationV4\Job as JobAlias;
 use Mailgun\Model\EmailValidationV4\JobDownloadUrl;
 use Mailgun\Model\EmailValidationV4\Summary;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class JobTest extends BaseModelTest
+class Job extends BaseModel
 {
     public function testCreate()
     {
@@ -49,7 +49,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = Job::create(json_decode($json, true));
+        $model = JobAlias::create(json_decode($json, true));
         $this->assertEquals('2020-05-21 16:56:31', $model->getCreatedAt()->format('Y-m-d H:i:s'));
         $this->assertInstanceOf(JobDownloadUrl::class, $model->getDownloadUrl());
         $this->assertEquals('bulk_validations_sandbox_mailgun_org', $model->getId());
diff --git a/tests/Model/EmailValidationV4/JobDownloadUrlTest.php b/tests/Model/EmailValidationV4/JobDownloadUrl.php
similarity index 66%
rename from tests/Model/EmailValidationV4/JobDownloadUrlTest.php
rename to tests/Model/EmailValidationV4/JobDownloadUrl.php
index 3d7f2ddb..69f791ad 100755
--- a/tests/Model/EmailValidationV4/JobDownloadUrlTest.php
+++ b/tests/Model/EmailValidationV4/JobDownloadUrl.php
@@ -9,12 +9,12 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-namespace Mailgun\Tests\Model\Event;
+namespace Mailgun\Tests\Model\EmailValidationV4;
 
-use Mailgun\Model\EmailValidationV4\JobDownloadUrl;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\EmailValidationV4\JobDownloadUrl as JobDownloadUrlALias;
+use Mailgun\Tests\Model\BaseModel;
 
-class JobDownloadUrlTest extends BaseModelTest
+class JobDownloadUrl extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
     "json": "https://example.com/file.json"
 }
 JSON;
-        $model = JobDownloadUrl::create(json_decode($json, true));
+        $model = JobDownloadUrlALias::create(json_decode($json, true));
         $this->assertEquals('https://example.com/file.csv', $model->getCsv());
         $this->assertEquals('https://example.com/file.json', $model->getJson());
     }
diff --git a/tests/Model/EmailValidationV4/PreviewTest.php b/tests/Model/EmailValidationV4/Preview.php
similarity index 82%
rename from tests/Model/EmailValidationV4/PreviewTest.php
rename to tests/Model/EmailValidationV4/Preview.php
index 1ef02b43..c7934d96 100755
--- a/tests/Model/EmailValidationV4/PreviewTest.php
+++ b/tests/Model/EmailValidationV4/Preview.php
@@ -9,13 +9,13 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-namespace Mailgun\Tests\Model\Event;
+namespace Mailgun\Tests\Model\EmailValidationV4;
 
-use Mailgun\Model\EmailValidationV4\Preview;
+use Mailgun\Model\EmailValidationV4\Preview as PreviewAlias;
 use Mailgun\Model\EmailValidationV4\Summary;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class PreviewTest extends BaseModelTest
+class Preview extends BaseModel
 {
     public function testCreate()
     {
@@ -44,7 +44,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = Preview::create(json_decode($json, true));
+        $model = PreviewAlias::create(json_decode($json, true));
         $this->assertEquals('test_500', $model->getId());
         $this->assertEquals(true, $model->isValid());
         $this->assertEquals('preview_complete', $model->getStatus());
diff --git a/tests/Model/EmailValidationV4/SummaryTest.php b/tests/Model/EmailValidationV4/Summary.php
similarity index 77%
rename from tests/Model/EmailValidationV4/SummaryTest.php
rename to tests/Model/EmailValidationV4/Summary.php
index 50369c04..755efc59 100755
--- a/tests/Model/EmailValidationV4/SummaryTest.php
+++ b/tests/Model/EmailValidationV4/Summary.php
@@ -9,14 +9,14 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-namespace Mailgun\Tests\Model\Event;
+namespace Mailgun\Tests\Model\EmailValidationV4;
 
-use Mailgun\Model\EmailValidationV4\Summary;
+use Mailgun\Model\EmailValidationV4\Summary as SummaryAlias;
 use Mailgun\Model\EmailValidationV4\SummaryResult;
 use Mailgun\Model\EmailValidationV4\SummaryRisk;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class SummaryTest extends BaseModelTest
+class Summary extends BaseModel
 {
     public function testCreate()
     {
@@ -38,7 +38,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = Summary::create(json_decode($json, true));
+        $model = SummaryAlias::create(json_decode($json, true));
         $this->assertInstanceOf(SummaryResult::class, $model->getResult());
         $this->assertInstanceOf(SummaryRisk::class, $model->getRisk());
     }
diff --git a/tests/Model/EmailValidationV4/SummaryResultTest.php b/tests/Model/EmailValidationV4/SummaryResult.php
similarity index 72%
rename from tests/Model/EmailValidationV4/SummaryResultTest.php
rename to tests/Model/EmailValidationV4/SummaryResult.php
index 5163481f..4d1d22fd 100755
--- a/tests/Model/EmailValidationV4/SummaryResultTest.php
+++ b/tests/Model/EmailValidationV4/SummaryResult.php
@@ -9,12 +9,12 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-namespace Mailgun\Tests\Model\Event;
+namespace Mailgun\Tests\Model\EmailValidationV4;
 
-use Mailgun\Model\EmailValidationV4\SummaryResult;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\EmailValidationV4\SummaryResult as SummaryResultAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class SummaryResultTest extends BaseModelTest
+class SummaryResult extends BaseModel
 {
     public function testCreate()
     {
@@ -28,7 +28,7 @@ public function testCreate()
     "unknown": 5613
 }
 JSON;
-        $model = SummaryResult::create(json_decode($json, true));
+        $model = SummaryResultAlias::create(json_decode($json, true));
         $this->assertEquals(181854, $model->getDeliverable());
         $this->assertEquals(5647, $model->getDoNotSend());
         $this->assertEquals(12116, $model->getUndeliverable());
diff --git a/tests/Model/EmailValidationV4/SummaryRiskTest.php b/tests/Model/EmailValidationV4/SummaryRisk.php
similarity index 69%
rename from tests/Model/EmailValidationV4/SummaryRiskTest.php
rename to tests/Model/EmailValidationV4/SummaryRisk.php
index dd834f1c..4bbe0726 100755
--- a/tests/Model/EmailValidationV4/SummaryRiskTest.php
+++ b/tests/Model/EmailValidationV4/SummaryRisk.php
@@ -9,12 +9,12 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-namespace Mailgun\Tests\Model\Event;
+namespace Mailgun\Tests\Model\EmailValidationV4;
 
-use Mailgun\Model\EmailValidationV4\SummaryRisk;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\EmailValidationV4\SummaryRisk as SummaryRiskAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class SummaryRiskTest extends BaseModelTest
+class SummaryRisk extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
     "unknown": 5613
 }
 JSON;
-        $model = SummaryRisk::create(json_decode($json, true));
+        $model = SummaryRiskAlias::create(json_decode($json, true));
         $this->assertEquals(17763, $model->getHigh());
         $this->assertEquals(142547, $model->getLow());
         $this->assertEquals(41652, $model->getMedium());
diff --git a/tests/Model/Event/EventResponseTest.php b/tests/Model/Event/EventResponse.php
similarity index 89%
rename from tests/Model/Event/EventResponseTest.php
rename to tests/Model/Event/EventResponse.php
index 88746208..076dc43e 100644
--- a/tests/Model/Event/EventResponseTest.php
+++ b/tests/Model/Event/EventResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Event;
 
-use Mailgun\Model\Event\EventResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Event\EventResponse as EventResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class EventResponseTest extends BaseModelTest
+class EventResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -65,7 +65,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = EventResponse::create(json_decode($json, true));
+        $model = EventResponseAlias::create(json_decode($json, true));
         $events = $model->getItems();
         $this->assertCount(1, $events);
         $event = $events[0];
diff --git a/tests/Model/Ip/IndexResponseTest.php b/tests/Model/Ip/IndexResponse.php
similarity index 78%
rename from tests/Model/Ip/IndexResponseTest.php
rename to tests/Model/Ip/IndexResponse.php
index 24cb6377..abb6efbf 100644
--- a/tests/Model/Ip/IndexResponseTest.php
+++ b/tests/Model/Ip/IndexResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Ip;
 
-use Mailgun\Model\Ip\IndexResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Ip\IndexResponse as IndexResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -26,7 +26,7 @@ public function testCreate()
   "total_count": 2
 }
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
         $this->assertEquals(2, $model->getTotalCount());
         $items = $model->getItems();
         $this->assertCount(2, $items);
@@ -43,7 +43,7 @@ public function testCreateWithAssignableToPools()
   "total_count": 2
 }
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
         $assignableToPools = $model->getAssignableToPools();
         $this->assertCount(1, $assignableToPools);
         $this->assertEquals('192.161.0.1', $assignableToPools[0]);
diff --git a/tests/Model/Ip/ShowResponseTest.php b/tests/Model/Ip/ShowResponse.php
similarity index 74%
rename from tests/Model/Ip/ShowResponseTest.php
rename to tests/Model/Ip/ShowResponse.php
index c5c476f3..697d53ce 100644
--- a/tests/Model/Ip/ShowResponseTest.php
+++ b/tests/Model/Ip/ShowResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Ip;
 
-use Mailgun\Model\Ip\ShowResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Ip\ShowResponse as ShowResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ShowResponseTest extends BaseModelTest
+class ShowResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -26,7 +26,7 @@ public function testCreate()
   "rdns": "luna.mailgun.net"
 }
 JSON;
-        $model = ShowResponse::create(json_decode($json, true));
+        $model = ShowResponseAlias::create(json_decode($json, true));
         $this->assertEquals('192.161.0.1', $model->getIp());
         $this->assertTrue($model->getDedicated());
         $this->assertEquals('luna.mailgun.net', $model->getRdns());
diff --git a/tests/Model/Ip/UpdateResponseTest.php b/tests/Model/Ip/UpdateResponse.php
similarity index 66%
rename from tests/Model/Ip/UpdateResponseTest.php
rename to tests/Model/Ip/UpdateResponse.php
index 291274cd..74b4fcd3 100644
--- a/tests/Model/Ip/UpdateResponseTest.php
+++ b/tests/Model/Ip/UpdateResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Ip;
 
-use Mailgun\Model\Ip\UpdateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Ip\UpdateResponse as UpdateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateResponseTest extends BaseModelTest
+class UpdateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
   "message": "success"
 }
 JSON;
-        $model = UpdateResponse::create(json_decode($json, true));
+        $model = UpdateResponseAlias::create(json_decode($json, true));
         $this->assertEquals('success', $model->getMessage());
     }
 }
diff --git a/tests/Model/MailingList/CreateResponseTest.php b/tests/Model/MailingList/CreateResponse.php
similarity index 79%
rename from tests/Model/MailingList/CreateResponseTest.php
rename to tests/Model/MailingList/CreateResponse.php
index 19c2b452..c0be3a5d 100644
--- a/tests/Model/MailingList/CreateResponseTest.php
+++ b/tests/Model/MailingList/CreateResponse.php
@@ -11,11 +11,11 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\CreateResponse;
+use Mailgun\Model\MailingList\CreateResponse as CreateResponseAlias;
 use Mailgun\Model\MailingList\MailingList;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class CreateResponseTest extends BaseModelTest
+class CreateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -32,7 +32,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = CreateResponse::create(json_decode($json, true));
+        $model = CreateResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Mailing list has been created', $model->getMessage());
         $this->assertInstanceOf(MailingList::class, $model->getList());
         $this->assertEquals(0, $model->getList()->getMembersCount());
diff --git a/tests/Model/MailingList/DeleteResponseTest.php b/tests/Model/MailingList/DeleteResponse.php
similarity index 72%
rename from tests/Model/MailingList/DeleteResponseTest.php
rename to tests/Model/MailingList/DeleteResponse.php
index ac017c2b..53d85e50 100644
--- a/tests/Model/MailingList/DeleteResponseTest.php
+++ b/tests/Model/MailingList/DeleteResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\DeleteResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\DeleteResponse as DeleteResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeleteResponseTest extends BaseModelTest
+class DeleteResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
   "address": "dev@samples.mailgun.org"
 }
 JSON;
-        $model = DeleteResponse::create(json_decode($json, true));
+        $model = DeleteResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Mailing list has been deleted', $model->getMessage());
         $this->assertEquals('dev@samples.mailgun.org', $model->getAddress());
     }
diff --git a/tests/Model/MailingList/Member/CreateResponseTest.php b/tests/Model/MailingList/Member/CreateResponse.php
similarity index 78%
rename from tests/Model/MailingList/Member/CreateResponseTest.php
rename to tests/Model/MailingList/Member/CreateResponse.php
index 13de4f81..e8c902ce 100644
--- a/tests/Model/MailingList/Member/CreateResponseTest.php
+++ b/tests/Model/MailingList/Member/CreateResponse.php
@@ -11,11 +11,11 @@
 
 namespace Mailgun\Tests\Model\MailingList\Member;
 
-use Mailgun\Model\MailingList\Member\CreateResponse;
+use Mailgun\Model\MailingList\Member\CreateResponse as CreateResponseAlias;
 use Mailgun\Model\MailingList\Member\Member;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class CreateResponseTest extends BaseModelTest
+class CreateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -33,7 +33,7 @@ public function testCreate()
   "message": "Mailing list member has been created"
 }
 JSON;
-        $model = CreateResponse::create(json_decode($json, true));
+        $model = CreateResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Mailing list member has been created', $model->getMessage());
         $this->assertInstanceOf(Member::class, $model->getMember());
         $this->assertEquals('Bob Bar', $model->getMember()->getName());
diff --git a/tests/Model/MailingList/Member/DeleteResponseTest.php b/tests/Model/MailingList/Member/DeleteResponse.php
similarity index 77%
rename from tests/Model/MailingList/Member/DeleteResponseTest.php
rename to tests/Model/MailingList/Member/DeleteResponse.php
index 6b8b8699..c55acdb2 100644
--- a/tests/Model/MailingList/Member/DeleteResponseTest.php
+++ b/tests/Model/MailingList/Member/DeleteResponse.php
@@ -11,11 +11,11 @@
 
 namespace Mailgun\Tests\Model\MailingList\Member;
 
-use Mailgun\Model\MailingList\Member\DeleteResponse;
+use Mailgun\Model\MailingList\Member\DeleteResponse as DeleteResponseAlias;
 use Mailgun\Model\MailingList\Member\Member;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeleteResponseTest extends BaseModelTest
+class DeleteResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -28,7 +28,7 @@ public function testCreate()
   "message": "Mailing list member has been deleted"
 }
 JSON;
-        $model = DeleteResponse::create(json_decode($json, true));
+        $model = DeleteResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Mailing list member has been deleted', $model->getMessage());
         $member = $model->getMember();
         $this->assertInstanceOf(Member::class, $member);
diff --git a/tests/Model/MailingList/Member/IndexResponseTest.php b/tests/Model/MailingList/Member/IndexResponse.php
similarity index 81%
rename from tests/Model/MailingList/Member/IndexResponseTest.php
rename to tests/Model/MailingList/Member/IndexResponse.php
index 6a96d1aa..5e01aa31 100644
--- a/tests/Model/MailingList/Member/IndexResponseTest.php
+++ b/tests/Model/MailingList/Member/IndexResponse.php
@@ -11,11 +11,11 @@
 
 namespace Mailgun\Tests\Model\MailingList\Member;
 
-use Mailgun\Model\MailingList\Member\IndexResponse;
+use Mailgun\Model\MailingList\Member\IndexResponse as IndexResponseAlias;
 use Mailgun\Model\MailingList\Member\Member;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -41,7 +41,7 @@ public function testCreate()
 }
 
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
         $members = $model->getItems();
         $this->assertCount(1, $members);
         $member = $members[0];
diff --git a/tests/Model/MailingList/Member/UpdateResponseTest.php b/tests/Model/MailingList/Member/UpdateResponse.php
similarity index 78%
rename from tests/Model/MailingList/Member/UpdateResponseTest.php
rename to tests/Model/MailingList/Member/UpdateResponse.php
index b06bb889..045f5c07 100644
--- a/tests/Model/MailingList/Member/UpdateResponseTest.php
+++ b/tests/Model/MailingList/Member/UpdateResponse.php
@@ -12,10 +12,10 @@
 namespace Mailgun\Tests\Model\MailingList\Member;
 
 use Mailgun\Model\MailingList\Member\Member;
-use Mailgun\Model\MailingList\Member\UpdateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\Member\UpdateResponse as UpdateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateResponseTest extends BaseModelTest
+class UpdateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -33,7 +33,7 @@ public function testCreate()
   "message": "Mailing list member has been updated"
 }
 JSON;
-        $model = UpdateResponse::create(json_decode($json, true));
+        $model = UpdateResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Mailing list member has been updated', $model->getMessage());
         $this->assertInstanceOf(Member::class, $model->getMember());
         $this->assertEquals('Foo Bar', $model->getMember()->getName());
diff --git a/tests/Model/MailingList/PagesResponseTest.php b/tests/Model/MailingList/PagesResponse.php
similarity index 84%
rename from tests/Model/MailingList/PagesResponseTest.php
rename to tests/Model/MailingList/PagesResponse.php
index 7cd916fb..5b4bce41 100644
--- a/tests/Model/MailingList/PagesResponseTest.php
+++ b/tests/Model/MailingList/PagesResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\PagesResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\PagesResponse as PagesResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class PagesResponseTest extends BaseModelTest
+class PagesResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -47,7 +47,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = PagesResponse::create(json_decode($json, true));
+        $model = PagesResponseAlias::create(json_decode($json, true));
         $lists = $model->getLists();
         $this->assertCount(2, $lists);
         $list = $lists[0];
diff --git a/tests/Model/MailingList/UpdateResponseTest.php b/tests/Model/MailingList/UpdateResponse.php
similarity index 92%
rename from tests/Model/MailingList/UpdateResponseTest.php
rename to tests/Model/MailingList/UpdateResponse.php
index 16f0b57b..1e224a5c 100644
--- a/tests/Model/MailingList/UpdateResponseTest.php
+++ b/tests/Model/MailingList/UpdateResponse.php
@@ -13,9 +13,9 @@
 
 use Mailgun\Model\MailingList\CreateResponse;
 use Mailgun\Model\MailingList\MailingList;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class UpdateResponseTest extends BaseModelTest
+class UpdateResponse extends BaseModel
 {
     public function testCreate()
     {
diff --git a/tests/Model/MailingList/ValidateResponseTest.php b/tests/Model/MailingList/ValidateResponse.php
similarity index 72%
rename from tests/Model/MailingList/ValidateResponseTest.php
rename to tests/Model/MailingList/ValidateResponse.php
index 9ce98b57..289ff071 100644
--- a/tests/Model/MailingList/ValidateResponseTest.php
+++ b/tests/Model/MailingList/ValidateResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\ValidateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\ValidateResponse as ValidateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidateResponseTest extends BaseModelTest
+class ValidateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
     "message": "The validation job was submitted."
 }
 JSON;
-        $model = ValidateResponse::create(json_decode($json, true));
+        $model = ValidateResponseAlias::create(json_decode($json, true));
         $this->assertEquals('The validation job was submitted.', $model->getMessage());
         $this->assertEquals('listname@yourdomain.com', $model->getId());
     }
diff --git a/tests/Model/MailingList/ValidationCancelResponseTest.php b/tests/Model/MailingList/ValidationCancelResponse.php
similarity index 64%
rename from tests/Model/MailingList/ValidationCancelResponseTest.php
rename to tests/Model/MailingList/ValidationCancelResponse.php
index 9f7c10a4..66738564 100644
--- a/tests/Model/MailingList/ValidationCancelResponseTest.php
+++ b/tests/Model/MailingList/ValidationCancelResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\ValidationCancelResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\ValidationCancelResponse as ValidationCancelResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidationCancelResponseTest extends BaseModelTest
+class ValidationCancelResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -24,7 +24,7 @@ public function testCreate()
     "message": "Validation job canceled."
 }
 JSON;
-        $model = ValidationCancelResponse::create(json_decode($json, true));
+        $model = ValidationCancelResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Validation job canceled.', $model->getMessage());
     }
 }
diff --git a/tests/Model/MailingList/ValidationStatusDownloadUrlTest.php b/tests/Model/MailingList/ValidationStatusDownloadUrl.php
similarity index 68%
rename from tests/Model/MailingList/ValidationStatusDownloadUrlTest.php
rename to tests/Model/MailingList/ValidationStatusDownloadUrl.php
index dc563a66..e7e94660 100644
--- a/tests/Model/MailingList/ValidationStatusDownloadUrlTest.php
+++ b/tests/Model/MailingList/ValidationStatusDownloadUrl.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\ValidationStatusDownloadUrl;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\ValidationStatusDownloadUrl as ValidationStatusDownloadUrlAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidationStatusDownloadUrlTest extends BaseModelTest
+class ValidationStatusDownloadUrl extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
     "json": "http://example.com/filname.json"
 }
 JSON;
-        $model = ValidationStatusDownloadUrl::create(json_decode($json, true));
+        $model = ValidationStatusDownloadUrlAlias::create(json_decode($json, true));
         $this->assertEquals('http://example.com/filname.csv', $model->getCsv());
         $this->assertEquals('http://example.com/filname.json', $model->getJson());
     }
diff --git a/tests/Model/MailingList/ValidationStatusResponseTest.php b/tests/Model/MailingList/ValidationStatusResponse.php
similarity index 91%
rename from tests/Model/MailingList/ValidationStatusResponseTest.php
rename to tests/Model/MailingList/ValidationStatusResponse.php
index b7f18ec4..6cd2c4b8 100644
--- a/tests/Model/MailingList/ValidationStatusResponseTest.php
+++ b/tests/Model/MailingList/ValidationStatusResponse.php
@@ -12,13 +12,13 @@
 namespace Mailgun\Tests\Model\MailingList;
 
 use Mailgun\Model\MailingList\ValidationStatusDownloadUrl;
-use Mailgun\Model\MailingList\ValidationStatusResponse;
+use Mailgun\Model\MailingList\ValidationStatusResponse as ValidationStatusResponseAlias;
 use Mailgun\Model\MailingList\ValidationStatusSummary;
 use Mailgun\Model\MailingList\ValidationStatusSummaryResult;
 use Mailgun\Model\MailingList\ValidationStatusSummaryRisk;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidationStatusResponseTest extends BaseModelTest
+class ValidationStatusResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -50,7 +50,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = ValidationStatusResponse::create(json_decode($json, true));
+        $model = ValidationStatusResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Tue, 26 Feb 2019 21:30:03 GMT', $model->getCreatedAt());
         $this->assertInstanceOf(ValidationStatusDownloadUrl::class, $model->getDownloadUrl());
         $this->assertEquals('http://example.com/filname.csv', $model->getDownloadUrl()->getCsv());
diff --git a/tests/Model/MailingList/ValidationStatusSummaryTest.php b/tests/Model/MailingList/ValidationStatusSummary.php
similarity index 85%
rename from tests/Model/MailingList/ValidationStatusSummaryTest.php
rename to tests/Model/MailingList/ValidationStatusSummary.php
index 7c325aa0..10c35f16 100644
--- a/tests/Model/MailingList/ValidationStatusSummaryTest.php
+++ b/tests/Model/MailingList/ValidationStatusSummary.php
@@ -11,12 +11,12 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\ValidationStatusSummary;
+use Mailgun\Model\MailingList\ValidationStatusSummary as ValidationStatusSummaryAlias;
 use Mailgun\Model\MailingList\ValidationStatusSummaryResult;
 use Mailgun\Model\MailingList\ValidationStatusSummaryRisk;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidationStatusSummaryTest extends BaseModelTest
+class ValidationStatusSummary extends BaseModel
 {
     public function testCreate()
     {
@@ -37,7 +37,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = ValidationStatusSummary::create(json_decode($json, true));
+        $model = ValidationStatusSummaryAlias::create(json_decode($json, true));
         $this->assertInstanceOf(ValidationStatusSummaryResult::class, $model->getResult());
         $this->assertEquals(184199, $model->getResult()->getDeliverable());
         $this->assertEquals(5647, $model->getResult()->getDoNotSend());
diff --git a/tests/Model/MailingList/ValidationStatusSummaryResultTest.php b/tests/Model/MailingList/ValidationStatusSummaryResult.php
similarity index 71%
rename from tests/Model/MailingList/ValidationStatusSummaryResultTest.php
rename to tests/Model/MailingList/ValidationStatusSummaryResult.php
index b80acd22..c15ccbca 100644
--- a/tests/Model/MailingList/ValidationStatusSummaryResultTest.php
+++ b/tests/Model/MailingList/ValidationStatusSummaryResult.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\ValidationStatusSummaryResult;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\ValidationStatusSummaryResult as ValidationStatusSummaryResultAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidationStatusSummaryResultTest extends BaseModelTest
+class ValidationStatusSummaryResult extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
     "unknown": 5613
 }
 JSON;
-        $model = ValidationStatusSummaryResult::create(json_decode($json, true));
+        $model = ValidationStatusSummaryResultAlias::create(json_decode($json, true));
         $this->assertEquals(184199, $model->getDeliverable());
         $this->assertEquals(5647, $model->getDoNotSend());
         $this->assertEquals(12116, $model->getUndeliverable());
diff --git a/tests/Model/MailingList/ValidationStatusSummaryRiskTest.php b/tests/Model/MailingList/ValidationStatusSummaryRisk.php
similarity index 70%
rename from tests/Model/MailingList/ValidationStatusSummaryRiskTest.php
rename to tests/Model/MailingList/ValidationStatusSummaryRisk.php
index 18b38585..0b854330 100644
--- a/tests/Model/MailingList/ValidationStatusSummaryRiskTest.php
+++ b/tests/Model/MailingList/ValidationStatusSummaryRisk.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\MailingList;
 
-use Mailgun\Model\MailingList\ValidationStatusSummaryRisk;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\MailingList\ValidationStatusSummaryRisk as ValidationStatusSummaryRiskAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ValidationStatusSummaryRiskTest extends BaseModelTest
+class ValidationStatusSummaryRisk extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
     "unknown": 5614
 }
 JSON;
-        $model = ValidationStatusSummaryRisk::create(json_decode($json, true));
+        $model = ValidationStatusSummaryRiskAlias::create(json_decode($json, true));
         $this->assertEquals(17763, $model->getHigh());
         $this->assertEquals(142547, $model->getLow());
         $this->assertEquals(41652, $model->getMedium());
diff --git a/tests/Model/Message/SendResponseTest.php b/tests/Model/Message/SendResponse.php
similarity index 74%
rename from tests/Model/Message/SendResponseTest.php
rename to tests/Model/Message/SendResponse.php
index ed872af5..5c305b76 100644
--- a/tests/Model/Message/SendResponseTest.php
+++ b/tests/Model/Message/SendResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Message;
 
-use Mailgun\Model\Message\SendResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Message\SendResponse as SendResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class SendResponseTest extends BaseModelTest
+class SendResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
   "id": "<20111114174239.25659.5817@samples.mailgun.org>"
 }
 JSON;
-        $model = SendResponse::create(json_decode($json, true));
+        $model = SendResponseAlias::create(json_decode($json, true));
         $this->assertEquals('<20111114174239.25659.5817@samples.mailgun.org>', $model->getId());
         $this->assertEquals('Queued. Thank you.', $model->getMessage());
     }
diff --git a/tests/Model/Route/CreateResponseTest.php b/tests/Model/Route/CreateResponse.php
similarity index 80%
rename from tests/Model/Route/CreateResponseTest.php
rename to tests/Model/Route/CreateResponse.php
index 4d52f340..8285a96b 100644
--- a/tests/Model/Route/CreateResponseTest.php
+++ b/tests/Model/Route/CreateResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Route;
 
-use Mailgun\Model\Route\CreateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Route\CreateResponse as CreateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CreateResponseTest extends BaseModelTest
+class CreateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -35,7 +35,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = CreateResponse::create(json_decode($json, true));
+        $model = CreateResponseAlias::create(json_decode($json, true));
 
         $this->assertEquals('Route has been created', $model->getMessage());
         $route = $model->getRoute();
diff --git a/tests/Model/Route/IndexResponseTest.php b/tests/Model/Route/IndexResponse.php
similarity index 82%
rename from tests/Model/Route/IndexResponseTest.php
rename to tests/Model/Route/IndexResponse.php
index d60ddbb4..deaede24 100644
--- a/tests/Model/Route/IndexResponseTest.php
+++ b/tests/Model/Route/IndexResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Route;
 
-use Mailgun\Model\Route\IndexResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Route\IndexResponse as IndexResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -37,7 +37,7 @@ public function testCreate()
   ]
 }
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
 
         $this->assertEquals('266', $model->getTotalCount());
         $routes = $model->getRoutes();
diff --git a/tests/Model/Route/ShowResponseTest.php b/tests/Model/Route/ShowResponse.php
similarity index 78%
rename from tests/Model/Route/ShowResponseTest.php
rename to tests/Model/Route/ShowResponse.php
index b06c92a7..4f3e8f61 100644
--- a/tests/Model/Route/ShowResponseTest.php
+++ b/tests/Model/Route/ShowResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Route;
 
-use Mailgun\Model\Route\ShowResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Route\ShowResponse as ShowResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ShowResponseTest extends BaseModelTest
+class ShowResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -34,7 +34,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = ShowResponse::create(json_decode($json, true));
+        $model = ShowResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Sample route', $model->getRoute()->getDescription());
     }
 }
diff --git a/tests/Model/Stats/TotalResponseTest.php b/tests/Model/Stats/TotalResponse.php
similarity index 87%
rename from tests/Model/Stats/TotalResponseTest.php
rename to tests/Model/Stats/TotalResponse.php
index 62105215..3b353ab4 100644
--- a/tests/Model/Stats/TotalResponseTest.php
+++ b/tests/Model/Stats/TotalResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Stats;
 
-use Mailgun\Model\Stats\TotalResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Stats\TotalResponse as TotalResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class TotalResponseTest extends BaseModelTest
+class TotalResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -57,7 +57,7 @@ public function testCreate()
   ]
 }
 JSON;
-        $model = TotalResponse::create(json_decode($json, true));
+        $model = TotalResponseAlias::create(json_decode($json, true));
         $this->assertEquals('2012-02-14', $model->getStart()->format('Y-m-d'));
         $this->assertCount(1, $model->getStats());
         $stats = $model->getStats();
diff --git a/tests/Model/Suppression/Unsubscribe/UnsubscribeTest.php b/tests/Model/Suppression/Unsubscribe/Unsubscribe.php
similarity index 63%
rename from tests/Model/Suppression/Unsubscribe/UnsubscribeTest.php
rename to tests/Model/Suppression/Unsubscribe/Unsubscribe.php
index 1d5e6fea..1f09abcd 100644
--- a/tests/Model/Suppression/Unsubscribe/UnsubscribeTest.php
+++ b/tests/Model/Suppression/Unsubscribe/Unsubscribe.php
@@ -11,17 +11,17 @@
 
 namespace Mailgun\Tests\Model\Suppression\Unsubscribe;
 
-use Mailgun\Model\Suppression\Unsubscribe\Unsubscribe;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Unsubscribe\Unsubscribe as UnsubscribeAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class UnsubscribeTest extends BaseModelTest
+class Unsubscribe extends BaseModel
 {
     /**
      * @test
      */
     public function itGetsEmptyListOfTagsByDefault()
     {
-        $unsubscribe = Unsubscribe::create(['address' => 'dummy@mailgun.net']);
+        $unsubscribe = UnsubscribeAlias::create(['address' => 'dummy@mailgun.net']);
         $this->assertEquals([], $unsubscribe->getTags());
     }
 
@@ -31,7 +31,7 @@ public function itGetsEmptyListOfTagsByDefault()
     public function itGetsTags()
     {
         $tags = ['tag1', 'tag2'];
-        $unsubscribe = Unsubscribe::create(['address' => 'dummy@mailgun.net', 'tags' => $tags]);
+        $unsubscribe = UnsubscribeAlias::create(['address' => 'dummy@mailgun.net', 'tags' => $tags]);
         $this->assertEquals($tags, $unsubscribe->getTags());
     }
 }
diff --git a/tests/Model/Suppression/Whitelists/CreateResponseTest.php b/tests/Model/Suppression/Whitelists/CreateResponse.php
similarity index 75%
rename from tests/Model/Suppression/Whitelists/CreateResponseTest.php
rename to tests/Model/Suppression/Whitelists/CreateResponse.php
index 962d2aba..f4da3d98 100644
--- a/tests/Model/Suppression/Whitelists/CreateResponseTest.php
+++ b/tests/Model/Suppression/Whitelists/CreateResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\CreateResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Whitelist\CreateResponse as CreateResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CreateResponseTest extends BaseModelTest
+class CreateResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -27,7 +27,7 @@ public function testCreate()
 }
 JSON;
 
-        $model = CreateResponse::create(json_decode($json, true));
+        $model = CreateResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Address/Domain has been added to the whitelists table', $model->getMessage());
         $this->assertEquals('domain', $model->getType());
         $this->assertEquals('example.com', $model->getValue());
diff --git a/tests/Model/Suppression/Whitelists/DeleteAllResponseTest.php b/tests/Model/Suppression/Whitelists/DeleteAllResponse.php
similarity index 69%
rename from tests/Model/Suppression/Whitelists/DeleteAllResponseTest.php
rename to tests/Model/Suppression/Whitelists/DeleteAllResponse.php
index 2ef8f515..ff4004c2 100644
--- a/tests/Model/Suppression/Whitelists/DeleteAllResponseTest.php
+++ b/tests/Model/Suppression/Whitelists/DeleteAllResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\DeleteAllResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Whitelist\DeleteAllResponse as DeleteAllResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeleteAllResponseTest extends BaseModelTest
+class DeleteAllResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
 }
 JSON;
 
-        $model = DeleteAllResponse::create(json_decode($json, true));
+        $model = DeleteAllResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Whitelist addresses/domains for this domain have been removed', $model->getMessage());
     }
 }
diff --git a/tests/Model/Suppression/Whitelists/DeleteResponseTest.php b/tests/Model/Suppression/Whitelists/DeleteResponse.php
similarity index 72%
rename from tests/Model/Suppression/Whitelists/DeleteResponseTest.php
rename to tests/Model/Suppression/Whitelists/DeleteResponse.php
index dfae2afd..30c274ff 100644
--- a/tests/Model/Suppression/Whitelists/DeleteResponseTest.php
+++ b/tests/Model/Suppression/Whitelists/DeleteResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\DeleteResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Whitelist\DeleteResponse as DeleteResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeleteResponseTest extends BaseModelTest
+class DeleteResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -26,7 +26,7 @@ public function testCreate()
 }
 JSON;
 
-        $model = DeleteResponse::create(json_decode($json, true));
+        $model = DeleteResponseAlias::create(json_decode($json, true));
         $this->assertEquals('Whitelist address/domain has been removed', $model->getMessage());
         $this->assertEquals('alice@example.com', $model->getValue());
     }
diff --git a/tests/Model/Suppression/Whitelists/ImportResponseTest.php b/tests/Model/Suppression/Whitelists/ImportResponse.php
similarity index 67%
rename from tests/Model/Suppression/Whitelists/ImportResponseTest.php
rename to tests/Model/Suppression/Whitelists/ImportResponse.php
index fc15c32d..b23636bd 100644
--- a/tests/Model/Suppression/Whitelists/ImportResponseTest.php
+++ b/tests/Model/Suppression/Whitelists/ImportResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\ImportResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Whitelist\ImportResponse as ImportResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ImportResponseTest extends BaseModelTest
+class ImportResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -25,7 +25,7 @@ public function testCreate()
 }
 JSON;
 
-        $model = ImportResponse::create(json_decode($json, true));
+        $model = ImportResponseAlias::create(json_decode($json, true));
         $this->assertEquals('file uploaded successfully', $model->getMessage());
     }
 }
diff --git a/tests/Model/Suppression/Whitelists/IndexResponseTest.php b/tests/Model/Suppression/Whitelists/IndexResponse.php
similarity index 91%
rename from tests/Model/Suppression/Whitelists/IndexResponseTest.php
rename to tests/Model/Suppression/Whitelists/IndexResponse.php
index c05e96ef..5fc0bfb9 100644
--- a/tests/Model/Suppression/Whitelists/IndexResponseTest.php
+++ b/tests/Model/Suppression/Whitelists/IndexResponse.php
@@ -11,11 +11,11 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\IndexResponse;
+use Mailgun\Model\Suppression\Whitelist\IndexResponse as IndexResponseAlias;
 use Mailgun\Model\Suppression\Whitelist\Whitelist;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -44,7 +44,7 @@ public function testCreate()
     }
 }
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
 
         $this->assertEquals(2, $model->getTotalCount());
         $this->assertEquals('https://url_to_next_page', $model->getFirstUrl());
diff --git a/tests/Model/Suppression/Whitelists/ShowResponseTest.php b/tests/Model/Suppression/Whitelists/ShowResponse.php
similarity index 80%
rename from tests/Model/Suppression/Whitelists/ShowResponseTest.php
rename to tests/Model/Suppression/Whitelists/ShowResponse.php
index 07ad6bab..dc0cfabb 100644
--- a/tests/Model/Suppression/Whitelists/ShowResponseTest.php
+++ b/tests/Model/Suppression/Whitelists/ShowResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\ShowResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Whitelist\ShowResponse as ShowResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ShowResponseTest extends BaseModelTest
+class ShowResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -28,7 +28,7 @@ public function testCreate()
 }
 JSON;
 
-        $model = ShowResponse::create(json_decode($json, true));
+        $model = ShowResponseAlias::create(json_decode($json, true));
         $this->assertEquals('alice@example.com', $model->getValue());
         $this->assertEquals('why the record was created', $model->getReason());
         $this->assertEquals('address', $model->getType());
diff --git a/tests/Model/Suppression/Whitelists/WhitelistTest.php b/tests/Model/Suppression/Whitelists/Whitelist.php
similarity index 79%
rename from tests/Model/Suppression/Whitelists/WhitelistTest.php
rename to tests/Model/Suppression/Whitelists/Whitelist.php
index fa7bb4c9..cd25a1c1 100644
--- a/tests/Model/Suppression/Whitelists/WhitelistTest.php
+++ b/tests/Model/Suppression/Whitelists/Whitelist.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Suppression\Whitelists;
 
-use Mailgun\Model\Suppression\Whitelist\Whitelist;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Suppression\Whitelist\Whitelist as WhitelistAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class WhitelistTest extends BaseModelTest
+class Whitelist extends BaseModel
 {
     public function testCreate()
     {
@@ -28,7 +28,7 @@ public function testCreate()
 }
 JSON;
 
-        $model = Whitelist::create(json_decode($json, true));
+        $model = WhitelistAlias::create(json_decode($json, true));
         $this->assertEquals('alice@example.com', $model->getValue());
         $this->assertEquals('why the record was created', $model->getReason());
         $this->assertEquals('address', $model->getType());
diff --git a/tests/Model/Tag/CountryResponseTest.php b/tests/Model/Tag/CountryResponse.php
similarity index 80%
rename from tests/Model/Tag/CountryResponseTest.php
rename to tests/Model/Tag/CountryResponse.php
index bd19ce67..cb3d6c32 100644
--- a/tests/Model/Tag/CountryResponseTest.php
+++ b/tests/Model/Tag/CountryResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Tag;
 
-use Mailgun\Model\Tag\CountryResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Tag\CountryResponse as CountryResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class CountryResponseTest extends BaseModelTest
+class CountryResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -42,7 +42,7 @@ public function testCreate()
   "tag": "exampletag"
 }
 JSON;
-        $model = CountryResponse::create(json_decode($json, true));
+        $model = CountryResponseAlias::create(json_decode($json, true));
 
         $this->assertCount(2, $model->getCountries());
         $this->assertEquals('exampletag', $model->getTag());
diff --git a/tests/Model/Tag/DeviceResponseTest.php b/tests/Model/Tag/DeviceResponse.php
similarity index 80%
rename from tests/Model/Tag/DeviceResponseTest.php
rename to tests/Model/Tag/DeviceResponse.php
index 2f88c716..9d97b3d7 100644
--- a/tests/Model/Tag/DeviceResponseTest.php
+++ b/tests/Model/Tag/DeviceResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Tag;
 
-use Mailgun\Model\Tag\DeviceResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Tag\DeviceResponse as DeviceResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class DeviceResponseTest extends BaseModelTest
+class DeviceResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -42,7 +42,7 @@ public function testCreate()
   "tag": "exampletag"
 }
 JSON;
-        $model = DeviceResponse::create(json_decode($json, true));
+        $model = DeviceResponseAlias::create(json_decode($json, true));
 
         $this->assertCount(2, $model->getDevices());
         $this->assertEquals('exampletag', $model->getTag());
diff --git a/tests/Model/Tag/IndexResponseTest.php b/tests/Model/Tag/IndexResponse.php
similarity index 83%
rename from tests/Model/Tag/IndexResponseTest.php
rename to tests/Model/Tag/IndexResponse.php
index fff4fa86..6fe542bc 100644
--- a/tests/Model/Tag/IndexResponseTest.php
+++ b/tests/Model/Tag/IndexResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Tag;
 
-use Mailgun\Model\Tag\IndexResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Tag\IndexResponse as IndexResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -43,7 +43,7 @@ public function testCreate()
   }
 }
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
 
         $tags = $model->getItems();
         $this->assertCount(2, $tags);
diff --git a/tests/Model/Tag/ProviderResponseTest.php b/tests/Model/Tag/ProviderResponse.php
similarity index 81%
rename from tests/Model/Tag/ProviderResponseTest.php
rename to tests/Model/Tag/ProviderResponse.php
index 580422f4..1b5b8bfd 100644
--- a/tests/Model/Tag/ProviderResponseTest.php
+++ b/tests/Model/Tag/ProviderResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Tag;
 
-use Mailgun\Model\Tag\ProviderResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Tag\ProviderResponse as ProviderResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ProviderResponseTest extends BaseModelTest
+class ProviderResponse extends BaseModel
 {
     public function testCreate()
     {
@@ -46,7 +46,7 @@ public function testCreate()
   "tag": "exampletag"
 }
 JSON;
-        $model = ProviderResponse::create(json_decode($json, true));
+        $model = ProviderResponseAlias::create(json_decode($json, true));
 
         $this->assertCount(2, $model->getProviders());
         $this->assertEquals('exampletag', $model->getTag());
diff --git a/tests/Model/Tag/TagTest.php b/tests/Model/Tag/Tag.php
similarity index 93%
rename from tests/Model/Tag/TagTest.php
rename to tests/Model/Tag/Tag.php
index 11702c41..9dcae88a 100644
--- a/tests/Model/Tag/TagTest.php
+++ b/tests/Model/Tag/Tag.php
@@ -12,9 +12,9 @@
 namespace Mailgun\Tests\Model\Tag;
 
 use Mailgun\Model\Tag\Tag as TagModel;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Tests\Model\BaseModel;
 
-class TagTest extends BaseModelTest
+class Tag extends BaseModel
 {
     public function testCreate()
     {
diff --git a/tests/Model/Webhook/IndexResponseTest.php b/tests/Model/Webhook/IndexResponse.php
similarity index 93%
rename from tests/Model/Webhook/IndexResponseTest.php
rename to tests/Model/Webhook/IndexResponse.php
index 6c4d1135..ea7bb860 100644
--- a/tests/Model/Webhook/IndexResponseTest.php
+++ b/tests/Model/Webhook/IndexResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Webhook;
 
-use Mailgun\Model\Webhook\IndexResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Webhook\IndexResponse as IndexResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class IndexResponseTest extends BaseModelTest
+class IndexResponse extends BaseModel
 {
     public function testCurrent()
     {
@@ -28,7 +28,7 @@ public function testCurrent()
       ]
     },
     "complained": {
-      "urls": [ 
+      "urls": [
         "http:\/\/example.com\/complained_1"
       ]
     },
@@ -61,7 +61,7 @@ public function testCurrent()
 }
 
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
 
         $this->assertContains('http://example.com/clicked_1', $model->getClickedUrls());
         $this->assertContains('http://example.com/complained_1', $model->getComplainedUrls());
@@ -110,7 +110,7 @@ public function testLegacy()
 }
 
 JSON;
-        $model = IndexResponse::create(json_decode($json, true));
+        $model = IndexResponseAlias::create(json_decode($json, true));
 
         $this->assertEquals('http://example.com/click_1', $model->getClickUrl());
         $this->assertEquals('http://example.com/bounce_1', $model->getBounceUrl());
diff --git a/tests/Model/Webhook/ShowResponseTest.php b/tests/Model/Webhook/ShowResponse.php
similarity index 70%
rename from tests/Model/Webhook/ShowResponseTest.php
rename to tests/Model/Webhook/ShowResponse.php
index bc86c6b0..d5366d09 100644
--- a/tests/Model/Webhook/ShowResponseTest.php
+++ b/tests/Model/Webhook/ShowResponse.php
@@ -11,10 +11,10 @@
 
 namespace Mailgun\Tests\Model\Webhook;
 
-use Mailgun\Model\Webhook\ShowResponse;
-use Mailgun\Tests\Model\BaseModelTest;
+use Mailgun\Model\Webhook\ShowResponse as ShowResponseAlias;
+use Mailgun\Tests\Model\BaseModel;
 
-class ShowResponseTest extends BaseModelTest
+class ShowResponse extends BaseModel
 {
     public function testHook1()
     {
@@ -29,7 +29,7 @@ public function testHook1()
 }
 
 JSON;
-        $model = ShowResponse::create(json_decode($json, true));
+        $model = ShowResponseAlias::create(json_decode($json, true));
 
         $this->assertContains('http://example.com/hook_1', $model->getWebhookUrls());
     }