diff --git a/tests/_config/bootstrap.php b/tests/_config/bootstrap.php
index 016e1668d9e..14458e2ee1a 100644
--- a/tests/_config/bootstrap.php
+++ b/tests/_config/bootstrap.php
@@ -8,7 +8,7 @@
 use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\Router;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\MemorySession as PhalconMemorySession;
+use Phalcon\Tests\Fixtures\MemorySession as PhalconMemorySession;
 use Phalcon\Url;
 
 $container = new FactoryDefault();
diff --git a/tests/_config/functions.php b/tests/_config/functions.php
index c90b5cece9c..84fe6fc0c9b 100644
--- a/tests/_config/functions.php
+++ b/tests/_config/functions.php
@@ -23,23 +23,23 @@
     function loadAutoloader(string $root)
     {
         Autoload::addNamespace(
-            'Phalcon\Test\Controllers',
+            'Phalcon\Tests\Controllers',
             $root . 'fixtures/controllers'
         );
         Autoload::addNamespace(
-            'Phalcon\Test\Models',
+            'Phalcon\Tests\Models',
             $root . 'fixtures/models'
         );
         Autoload::addNamespace(
-            'Phalcon\Test\Resultsets',
+            'Phalcon\Tests\Resultsets',
             $root . 'fixtures/resultsets'
         );
         Autoload::addNamespace(
-            'Phalcon\Test\Modules\Frontend\Controllers',
+            'Phalcon\Tests\Modules\Frontend\Controllers',
             $root . 'fixtures/modules/frontend/controllers/'
         );
         Autoload::addNamespace(
-            'Phalcon\Test\Modules\Backend\Controllers',
+            'Phalcon\Tests\Modules\Backend\Controllers',
             $root . 'fixtures/modules/backend/controllers/'
         );
     }
diff --git a/tests/_config/generate-db-schemas.php b/tests/_config/generate-db-schemas.php
index 4d894635d71..e82afc2e6df 100644
--- a/tests/_config/generate-db-schemas.php
+++ b/tests/_config/generate-db-schemas.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-use Phalcon\Test\Fixtures\Migrations\AbstractMigration;
+use Phalcon\Tests\Fixtures\Migrations\AbstractMigration;
 
 error_reporting(E_ALL);
 ini_set('display_errors', 'On');
@@ -28,7 +28,7 @@
 ];
 
 $migrations     = getMigrations($root);
-$migrationClass = 'Phalcon\Test\Fixtures\Migrations\%s';
+$migrationClass = 'Phalcon\Tests\Fixtures\Migrations\%s';
 
 foreach ($drivers as $driver) {
     $schema = $root . '/tests/_data/assets/schemas/' . $driver . '.sql';
diff --git a/tests/_config/generate-test-stubs.php b/tests/_config/generate-test-stubs.php
index 0645e5b8e5d..b7102f62d03 100644
--- a/tests/_config/generate-test-stubs.php
+++ b/tests/_config/generate-test-stubs.php
@@ -24,7 +24,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\%type%\%n%;
+namespace Phalcon\Tests\%type%\%n%;
 
 use %type%Tester;
 
diff --git a/tests/_data/fixtures/Acl/TestComponentAware.php b/tests/_data/fixtures/Acl/TestComponentAware.php
index 7dec01eb4a6..9781fe392be 100644
--- a/tests/_data/fixtures/Acl/TestComponentAware.php
+++ b/tests/_data/fixtures/Acl/TestComponentAware.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Acl;
+namespace Phalcon\Tests\Fixtures\Acl;
 
 use Phalcon\Acl\ComponentAware;
 
diff --git a/tests/_data/fixtures/Acl/TestRoleAware.php b/tests/_data/fixtures/Acl/TestRoleAware.php
index ae800d24c85..be1d205f78c 100644
--- a/tests/_data/fixtures/Acl/TestRoleAware.php
+++ b/tests/_data/fixtures/Acl/TestRoleAware.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Acl;
+namespace Phalcon\Tests\Fixtures\Acl;
 
 use Phalcon\Acl\RoleAware;
 
diff --git a/tests/_data/fixtures/Acl/TestRoleComponentAware.php b/tests/_data/fixtures/Acl/TestRoleComponentAware.php
index 7a1d1cad556..b8a13845006 100644
--- a/tests/_data/fixtures/Acl/TestRoleComponentAware.php
+++ b/tests/_data/fixtures/Acl/TestRoleComponentAware.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Acl;
+namespace Phalcon\Tests\Fixtures\Acl;
 
 use Phalcon\Acl\ComponentAware;
 use Phalcon\Acl\RoleAware;
diff --git a/tests/_data/fixtures/Assets/CustomTag.php b/tests/_data/fixtures/Assets/CustomTag.php
index 661f41a3914..a2c2d8e8c93 100644
--- a/tests/_data/fixtures/Assets/CustomTag.php
+++ b/tests/_data/fixtures/Assets/CustomTag.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Assets;
+namespace Phalcon\Tests\Fixtures\Assets;
 
 class CustomTag extends \Phalcon\Tag
 {
diff --git a/tests/_data/fixtures/Assets/TrimFilter.php b/tests/_data/fixtures/Assets/TrimFilter.php
index a8c573a89bc..4d4b6d036ab 100644
--- a/tests/_data/fixtures/Assets/TrimFilter.php
+++ b/tests/_data/fixtures/Assets/TrimFilter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Assets;
+namespace Phalcon\Tests\Fixtures\Assets;
 
 use Phalcon\Assets\FilterInterface;
 
diff --git a/tests/_data/fixtures/Assets/UppercaseFilter.php b/tests/_data/fixtures/Assets/UppercaseFilter.php
index 47f3171263a..1b4ffdd630b 100644
--- a/tests/_data/fixtures/Assets/UppercaseFilter.php
+++ b/tests/_data/fixtures/Assets/UppercaseFilter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Assets;
+namespace Phalcon\Tests\Fixtures\Assets;
 
 use Phalcon\Assets\FilterInterface;
 
diff --git a/tests/_data/fixtures/Cache/Adapter/Libmemcached.php b/tests/_data/fixtures/Cache/Adapter/Libmemcached.php
index b739ce133b0..cddf5d77198 100644
--- a/tests/_data/fixtures/Cache/Adapter/Libmemcached.php
+++ b/tests/_data/fixtures/Cache/Adapter/Libmemcached.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Cache\Adapter;
+namespace Phalcon\Tests\Fixtures\Cache\Adapter;
 
 use Phalcon\Cache\Adapter\Libmemcached as CacheLibmemcached;
 use Phalcon\Storage\Exception;
 
 /**
- * Phalcon\Test\Fixtures\Cache\Adapter
+ * Phalcon\Tests\Fixtures\Cache\Adapter
  *
  * Libmemcached adapter fixture
  */
diff --git a/tests/_data/fixtures/Cache/CacheFixtureData.php b/tests/_data/fixtures/Cache/CacheFixtureData.php
index d8cd2826871..10a21b6f75d 100644
--- a/tests/_data/fixtures/Cache/CacheFixtureData.php
+++ b/tests/_data/fixtures/Cache/CacheFixtureData.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Cache;
+namespace Phalcon\Tests\Fixtures\Cache;
 
 use stdClass;
 
 /**
- * Phalcon\Test\Fixtures\Cache
+ * Phalcon\Tests\Fixtures\Cache
  *
  */
 class CacheFixtureData
diff --git a/tests/_data/fixtures/DataMapper/Pdo/ConnectionFixture.php b/tests/_data/fixtures/DataMapper/Pdo/ConnectionFixture.php
index df637ae3087..4ff35d82026 100644
--- a/tests/_data/fixtures/DataMapper/Pdo/ConnectionFixture.php
+++ b/tests/_data/fixtures/DataMapper/Pdo/ConnectionFixture.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\DataMapper\Pdo;
+namespace Phalcon\Tests\Fixtures\DataMapper\Pdo;
 
 use Phalcon\DataMapper\Pdo\Connection;
 use Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface;
diff --git a/tests/_data/fixtures/DataMapper/Pdo/PdoFixture.php b/tests/_data/fixtures/DataMapper/Pdo/PdoFixture.php
index 86998a85a69..f8cae9ac25d 100644
--- a/tests/_data/fixtures/DataMapper/Pdo/PdoFixture.php
+++ b/tests/_data/fixtures/DataMapper/Pdo/PdoFixture.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\DataMapper\Pdo;
+namespace Phalcon\Tests\Fixtures\DataMapper\Pdo;
 
 class PdoFixture
 {
diff --git a/tests/_data/fixtures/Db/Profiler.php b/tests/_data/fixtures/Db/Profiler.php
index faec91e2b46..61b7a11be5a 100644
--- a/tests/_data/fixtures/Db/Profiler.php
+++ b/tests/_data/fixtures/Db/Profiler.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Db;
+namespace Phalcon\Tests\Fixtures\Db;
 
 use Phalcon\Db\Profiler as PhalconProfiler;
 
diff --git a/tests/_data/fixtures/Db/ProfilerListener.php b/tests/_data/fixtures/Db/ProfilerListener.php
index b737c6cfb96..ba9bde35f32 100644
--- a/tests/_data/fixtures/Db/ProfilerListener.php
+++ b/tests/_data/fixtures/Db/ProfilerListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Db;
+namespace Phalcon\Tests\Fixtures\Db;
 
 class ProfilerListener
 {
diff --git a/tests/_data/fixtures/Db/QueryListener.php b/tests/_data/fixtures/Db/QueryListener.php
index 28ef113b5b8..0b33148e3a2 100644
--- a/tests/_data/fixtures/Db/QueryListener.php
+++ b/tests/_data/fixtures/Db/QueryListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Db;
+namespace Phalcon\Tests\Fixtures\Db;
 
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Di\Injectable;
@@ -21,7 +21,7 @@
 /**
  * Class QueryListener
  *
- * @package Phalcon\Test\Fixtures\Db
+ * @package Phalcon\Tests\Fixtures\Db
  *
  * @property Logger $logger
  */
diff --git a/tests/_data/fixtures/Di/services.php b/tests/_data/fixtures/Di/services.php
index 7b6f6cc84ae..9b9c38b4775 100644
--- a/tests/_data/fixtures/Di/services.php
+++ b/tests/_data/fixtures/Di/services.php
@@ -1,7 +1,7 @@
 <?php
 
 use Phalcon\Config;
-use Phalcon\Test\Module\UnitTest;
+use Phalcon\Tests\Module\UnitTest;
 
 return [
     'unit-test' => [
diff --git a/tests/_data/fixtures/Di/services.yml b/tests/_data/fixtures/Di/services.yml
index a58ddcc466b..822279410cb 100644
--- a/tests/_data/fixtures/Di/services.yml
+++ b/tests/_data/fixtures/Di/services.yml
@@ -1,5 +1,5 @@
 unit-test:
-  className: \Phalcon\Test\Module\UnitTest
+  className: \Phalcon\Tests\Module\UnitTest
 
 config:
   className: \Phalcon\Config
diff --git a/tests/_data/fixtures/Dump/ClassProperties.php b/tests/_data/fixtures/Dump/ClassProperties.php
index 4a65bfe5073..95e40c22370 100644
--- a/tests/_data/fixtures/Dump/ClassProperties.php
+++ b/tests/_data/fixtures/Dump/ClassProperties.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Dump;
+namespace Phalcon\Tests\Fixtures\Dump;
 
 /**
  * Class ClassProperties
diff --git a/tests/_data/fixtures/Dump/class_properties.txt b/tests/_data/fixtures/Dump/class_properties.txt
index 31962dda9b9..ce5903aa3ef 100644
--- a/tests/_data/fixtures/Dump/class_properties.txt
+++ b/tests/_data/fixtures/Dump/class_properties.txt
@@ -1,7 +1,7 @@
-Object Phalcon\Test\Fixtures\Dump\ClassProperties (
+Object Phalcon\Tests\Fixtures\Dump\ClassProperties (
   ->foo (public) = Integer (1)
   ->bar (protected) = Integer (2)
   ->baz (private) = Integer (3)
-  Phalcon\Test\Fixtures\Dump\ClassProperties methods: (0) (
+  Phalcon\Tests\Fixtures\Dump\ClassProperties methods: (0) (
   )
 )
diff --git a/tests/_data/fixtures/Events/ComponentX.php b/tests/_data/fixtures/Events/ComponentX.php
index 17330a4128e..80f68f024b3 100644
--- a/tests/_data/fixtures/Events/ComponentX.php
+++ b/tests/_data/fixtures/Events/ComponentX.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Events;
+namespace Phalcon\Tests\Fixtures\Events;
 
 use Phalcon\Events\Manager;
 
diff --git a/tests/_data/fixtures/Events/ComponentY.php b/tests/_data/fixtures/Events/ComponentY.php
index 6a98512015a..b9e50188373 100644
--- a/tests/_data/fixtures/Events/ComponentY.php
+++ b/tests/_data/fixtures/Events/ComponentY.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Events;
+namespace Phalcon\Tests\Fixtures\Events;
 
 use Phalcon\Events\Manager;
 
diff --git a/tests/_data/fixtures/Filter/Sanitize/IPv4.php b/tests/_data/fixtures/Filter/Sanitize/IPv4.php
index fc05d9cbded..dc25be39294 100644
--- a/tests/_data/fixtures/Filter/Sanitize/IPv4.php
+++ b/tests/_data/fixtures/Filter/Sanitize/IPv4.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Filter\Sanitize;
+namespace Phalcon\Tests\Fixtures\Filter\Sanitize;
 
 /**
  * Class IPv4
diff --git a/tests/_data/fixtures/Forms/ContactFormPublicProperties.php b/tests/_data/fixtures/Forms/ContactFormPublicProperties.php
index e3e64aa6e80..92dfe0965ca 100644
--- a/tests/_data/fixtures/Forms/ContactFormPublicProperties.php
+++ b/tests/_data/fixtures/Forms/ContactFormPublicProperties.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Forms;
+namespace Phalcon\Tests\Fixtures\Forms;
 
 class ContactFormPublicProperties
 {
diff --git a/tests/_data/fixtures/Forms/ContactFormSettersGetters.php b/tests/_data/fixtures/Forms/ContactFormSettersGetters.php
index f44d95f64a4..8f1b2b7a1ae 100644
--- a/tests/_data/fixtures/Forms/ContactFormSettersGetters.php
+++ b/tests/_data/fixtures/Forms/ContactFormSettersGetters.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Forms;
+namespace Phalcon\Tests\Fixtures\Forms;
 
 class ContactFormSettersGetters
 {
diff --git a/tests/_data/fixtures/Forms/SetActionForm.php b/tests/_data/fixtures/Forms/SetActionForm.php
index daad1ea2544..23356240a4d 100644
--- a/tests/_data/fixtures/Forms/SetActionForm.php
+++ b/tests/_data/fixtures/Forms/SetActionForm.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Forms;
+namespace Phalcon\Tests\Fixtures\Forms;
 
 use Phalcon\Forms\Form;
 
diff --git a/tests/_data/fixtures/Forms/ValidationForm.php b/tests/_data/fixtures/Forms/ValidationForm.php
index 71d1c212ace..a7eec8c0e74 100644
--- a/tests/_data/fixtures/Forms/ValidationForm.php
+++ b/tests/_data/fixtures/Forms/ValidationForm.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Forms;
+namespace Phalcon\Tests\Fixtures\Forms;
 
 use Phalcon\Forms\Element\Email;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/_data/fixtures/Helper/JsonFixture.php b/tests/_data/fixtures/Helper/JsonFixture.php
index 06a2b5656c9..640a0252493 100644
--- a/tests/_data/fixtures/Helper/JsonFixture.php
+++ b/tests/_data/fixtures/Helper/JsonFixture.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Helper;
+namespace Phalcon\Tests\Fixtures\Helper;
 
 use JsonSerializable;
 
diff --git a/tests/_data/fixtures/Helpers/TagHelper.php b/tests/_data/fixtures/Helpers/TagHelper.php
index c039be83b95..95589556661 100644
--- a/tests/_data/fixtures/Helpers/TagHelper.php
+++ b/tests/_data/fixtures/Helpers/TagHelper.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Helpers;
+namespace Phalcon\Tests\Fixtures\Helpers;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Helpers/TagSetup.php b/tests/_data/fixtures/Helpers/TagSetup.php
index 80949c147e4..ffe3975ab8b 100644
--- a/tests/_data/fixtures/Helpers/TagSetup.php
+++ b/tests/_data/fixtures/Helpers/TagSetup.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Helpers;
+namespace Phalcon\Tests\Fixtures\Helpers;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class TagSetup
diff --git a/tests/_data/fixtures/Helpers/TranslateCsvHelper.php b/tests/_data/fixtures/Helpers/TranslateCsvHelper.php
index b41a58aa889..b95e1a9c6c6 100644
--- a/tests/_data/fixtures/Helpers/TranslateCsvHelper.php
+++ b/tests/_data/fixtures/Helpers/TranslateCsvHelper.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Helpers;
+namespace Phalcon\Tests\Fixtures\Helpers;
 
 use Codeception\Example;
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/_data/fixtures/Helpers/TranslateGettextHelper.php b/tests/_data/fixtures/Helpers/TranslateGettextHelper.php
index 267e6f12f5f..cfa46873043 100644
--- a/tests/_data/fixtures/Helpers/TranslateGettextHelper.php
+++ b/tests/_data/fixtures/Helpers/TranslateGettextHelper.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Helpers;
+namespace Phalcon\Tests\Fixtures\Helpers;
 
 use Codeception\Example;
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/_data/fixtures/Helpers/TranslateNativeArrayHelper.php b/tests/_data/fixtures/Helpers/TranslateNativeArrayHelper.php
index da998f137f2..5cb4018d26f 100644
--- a/tests/_data/fixtures/Helpers/TranslateNativeArrayHelper.php
+++ b/tests/_data/fixtures/Helpers/TranslateNativeArrayHelper.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Helpers;
+namespace Phalcon\Tests\Fixtures\Helpers;
 
 use Codeception\Example;
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/_data/fixtures/Http/Message/ServerRequestFactoryFixture.php b/tests/_data/fixtures/Http/Message/ServerRequestFactoryFixture.php
index cbd02e285cb..e8b13c18e46 100644
--- a/tests/_data/fixtures/Http/Message/ServerRequestFactoryFixture.php
+++ b/tests/_data/fixtures/Http/Message/ServerRequestFactoryFixture.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Http\Message;
+namespace Phalcon\Tests\Fixtures\Http\Message;
 
 use Phalcon\Http\Message\ServerRequestFactory;
 
diff --git a/tests/_data/fixtures/Http/Message/StreamFixture.php b/tests/_data/fixtures/Http/Message/StreamFixture.php
index 8fb94acd5f8..0a76aae5776 100644
--- a/tests/_data/fixtures/Http/Message/StreamFixture.php
+++ b/tests/_data/fixtures/Http/Message/StreamFixture.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Http\Message;
+namespace Phalcon\Tests\Fixtures\Http\Message;
 
 use Phalcon\Http\Message\Stream;
 
diff --git a/tests/_data/fixtures/Http/PhpStream.php b/tests/_data/fixtures/Http/PhpStream.php
index c2e9ad853b0..7c338f116ca 100644
--- a/tests/_data/fixtures/Http/PhpStream.php
+++ b/tests/_data/fixtures/Http/PhpStream.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Http;
+namespace Phalcon\Tests\Fixtures\Http;
 
 /**
  * @link http://php.net/manual/en/class.streamwrapper.php
diff --git a/tests/_data/fixtures/Http/Server/MiddlewareFixture.php b/tests/_data/fixtures/Http/Server/MiddlewareFixture.php
index e6602926867..a0615963c50 100644
--- a/tests/_data/fixtures/Http/Server/MiddlewareFixture.php
+++ b/tests/_data/fixtures/Http/Server/MiddlewareFixture.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Http\Server;
+namespace Phalcon\Tests\Fixtures\Http\Server;
 
 use Phalcon\Http\Server\AbstractMiddleware;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/_data/fixtures/Http/Server/RequestHandlerFixture.php b/tests/_data/fixtures/Http/Server/RequestHandlerFixture.php
index 61020e8f017..0b25bc62b84 100644
--- a/tests/_data/fixtures/Http/Server/RequestHandlerFixture.php
+++ b/tests/_data/fixtures/Http/Server/RequestHandlerFixture.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Http\Server;
+namespace Phalcon\Tests\Fixtures\Http\Server;
 
 use Phalcon\Http\Server\AbstractRequestHandler;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/_data/fixtures/Listener/CustomAuthorizationListener.php b/tests/_data/fixtures/Listener/CustomAuthorizationListener.php
index 966f74f26b2..11ae4ea3c80 100644
--- a/tests/_data/fixtures/Listener/CustomAuthorizationListener.php
+++ b/tests/_data/fixtures/Listener/CustomAuthorizationListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Listener;
+namespace Phalcon\Tests\Fixtures\Listener;
 
 use Phalcon\Events\Event;
 use Phalcon\Http\Request;
diff --git a/tests/_data/fixtures/Listener/FirstListener.php b/tests/_data/fixtures/Listener/FirstListener.php
index 461fe7c5fd0..408dd3a5ccb 100644
--- a/tests/_data/fixtures/Listener/FirstListener.php
+++ b/tests/_data/fixtures/Listener/FirstListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Listener;
+namespace Phalcon\Tests\Fixtures\Listener;
 
 class FirstListener
 {
diff --git a/tests/_data/fixtures/Listener/NegotiateAuthorizationListener.php b/tests/_data/fixtures/Listener/NegotiateAuthorizationListener.php
index 4ec31cf0a00..ad51e5cb1f5 100644
--- a/tests/_data/fixtures/Listener/NegotiateAuthorizationListener.php
+++ b/tests/_data/fixtures/Listener/NegotiateAuthorizationListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Listener;
+namespace Phalcon\Tests\Fixtures\Listener;
 
 use Phalcon\Events\Event;
 use Phalcon\Http\Request;
diff --git a/tests/_data/fixtures/Listener/SecondListener.php b/tests/_data/fixtures/Listener/SecondListener.php
index 959c8f0785e..bd3812b6612 100644
--- a/tests/_data/fixtures/Listener/SecondListener.php
+++ b/tests/_data/fixtures/Listener/SecondListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Listener;
+namespace Phalcon\Tests\Fixtures\Listener;
 
 class SecondListener
 {
diff --git a/tests/_data/fixtures/Listener/ThirdListener.php b/tests/_data/fixtures/Listener/ThirdListener.php
index f6fc72eecdc..349735004b4 100644
--- a/tests/_data/fixtures/Listener/ThirdListener.php
+++ b/tests/_data/fixtures/Listener/ThirdListener.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Listener;
+namespace Phalcon\Tests\Fixtures\Listener;
 
 use Phalcon\Events\Event;
-use Phalcon\Test\Fixtures\Events\ComponentX;
-use Phalcon\Test\Unit\Events\ManagerCest;
+use Phalcon\Tests\Fixtures\Events\ComponentX;
+use Phalcon\Tests\Unit\Events\ManagerCest;
 use UnitTester;
 
 class ThirdListener
diff --git a/tests/_data/fixtures/Listener/ViewCompileListener.php b/tests/_data/fixtures/Listener/ViewCompileListener.php
index f49f5263482..989ef28e72e 100644
--- a/tests/_data/fixtures/Listener/ViewCompileListener.php
+++ b/tests/_data/fixtures/Listener/ViewCompileListener.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Listener;
+namespace Phalcon\Tests\Fixtures\Listener;
 
 use IntegrationTester;
 use Phalcon\Events\Event;
-use Phalcon\Test\Integration\Mvc\View\Engine\Volt\RenderCest;
+use Phalcon\Tests\Integration\Mvc\View\Engine\Volt\RenderCest;
 use UnitTester;
 
 /**
diff --git a/tests/_data/fixtures/Micro/HttpMethodHandler.php b/tests/_data/fixtures/Micro/HttpMethodHandler.php
index ef8d45d9018..c1e21e11e78 100644
--- a/tests/_data/fixtures/Micro/HttpMethodHandler.php
+++ b/tests/_data/fixtures/Micro/HttpMethodHandler.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Micro;
+namespace Phalcon\Tests\Fixtures\Micro;
 
 class HttpMethodHandler
 {
diff --git a/tests/_data/fixtures/Micro/MyMiddleware.php b/tests/_data/fixtures/Micro/MyMiddleware.php
index 06b48217ea9..e2b2f3e0fc8 100644
--- a/tests/_data/fixtures/Micro/MyMiddleware.php
+++ b/tests/_data/fixtures/Micro/MyMiddleware.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Micro;
+namespace Phalcon\Tests\Fixtures\Micro;
 
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\MiddlewareInterface;
diff --git a/tests/_data/fixtures/Micro/MyMiddlewareStop.php b/tests/_data/fixtures/Micro/MyMiddlewareStop.php
index 9cb49d81376..5371f1a5b9d 100644
--- a/tests/_data/fixtures/Micro/MyMiddlewareStop.php
+++ b/tests/_data/fixtures/Micro/MyMiddlewareStop.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Micro;
+namespace Phalcon\Tests\Fixtures\Micro;
 
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\MiddlewareInterface;
diff --git a/tests/_data/fixtures/Micro/RestHandler.php b/tests/_data/fixtures/Micro/RestHandler.php
index 81e17c34b17..98f7d74ff5c 100644
--- a/tests/_data/fixtures/Micro/RestHandler.php
+++ b/tests/_data/fixtures/Micro/RestHandler.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Micro;
+namespace Phalcon\Tests\Fixtures\Micro;
 
 class RestHandler
 {
diff --git a/tests/_data/fixtures/Migrations/AbstractMigration.php b/tests/_data/fixtures/Migrations/AbstractMigration.php
index 477a0f641fd..f9e7dda791c 100644
--- a/tests/_data/fixtures/Migrations/AbstractMigration.php
+++ b/tests/_data/fixtures/Migrations/AbstractMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 use PDO;
 
diff --git a/tests/_data/fixtures/Migrations/ComplexDefaultMigration.php b/tests/_data/fixtures/Migrations/ComplexDefaultMigration.php
index 28cb0fdbef3..57bb8ac1467 100644
--- a/tests/_data/fixtures/Migrations/ComplexDefaultMigration.php
+++ b/tests/_data/fixtures/Migrations/ComplexDefaultMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 class ComplexDefaultMigration extends AbstractMigration
 {
diff --git a/tests/_data/fixtures/Migrations/CustomersDefaultsMigration.php b/tests/_data/fixtures/Migrations/CustomersDefaultsMigration.php
index 4939d545ba3..b9f45369aab 100644
--- a/tests/_data/fixtures/Migrations/CustomersDefaultsMigration.php
+++ b/tests/_data/fixtures/Migrations/CustomersDefaultsMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 use PHPUnit\Framework\Assert;
 
diff --git a/tests/_data/fixtures/Migrations/CustomersMigration.php b/tests/_data/fixtures/Migrations/CustomersMigration.php
index 75b99a2f5dc..b50205ccc13 100644
--- a/tests/_data/fixtures/Migrations/CustomersMigration.php
+++ b/tests/_data/fixtures/Migrations/CustomersMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 use PHPUnit\Framework\Assert;
 
diff --git a/tests/_data/fixtures/Migrations/DialectMigration.php b/tests/_data/fixtures/Migrations/DialectMigration.php
index 94f7d6e519d..41d8b7ebc88 100644
--- a/tests/_data/fixtures/Migrations/DialectMigration.php
+++ b/tests/_data/fixtures/Migrations/DialectMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 use PDO;
 use Phalcon\Db\Column;
diff --git a/tests/_data/fixtures/Migrations/FractalDatesMigration.php b/tests/_data/fixtures/Migrations/FractalDatesMigration.php
index 4d2aeea440d..3595f40d68c 100644
--- a/tests/_data/fixtures/Migrations/FractalDatesMigration.php
+++ b/tests/_data/fixtures/Migrations/FractalDatesMigration.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class FractalDatesMigration
diff --git a/tests/_data/fixtures/Migrations/InvoicesMigration.php b/tests/_data/fixtures/Migrations/InvoicesMigration.php
index 92ec45b96bf..b42b639229d 100644
--- a/tests/_data/fixtures/Migrations/InvoicesMigration.php
+++ b/tests/_data/fixtures/Migrations/InvoicesMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 use PHPUnit\Framework\Assert;
 
diff --git a/tests/_data/fixtures/Migrations/ObjectsMigration.php b/tests/_data/fixtures/Migrations/ObjectsMigration.php
index 325bc90c326..3aa395fec86 100644
--- a/tests/_data/fixtures/Migrations/ObjectsMigration.php
+++ b/tests/_data/fixtures/Migrations/ObjectsMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class ObjectsMigration
diff --git a/tests/_data/fixtures/Migrations/OrdersMigration.php b/tests/_data/fixtures/Migrations/OrdersMigration.php
index ea50ba87cfc..b9dbe6a7a38 100644
--- a/tests/_data/fixtures/Migrations/OrdersMigration.php
+++ b/tests/_data/fixtures/Migrations/OrdersMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class OrdersMigration
diff --git a/tests/_data/fixtures/Migrations/OrdersProductsMigration.php b/tests/_data/fixtures/Migrations/OrdersProductsMigration.php
index d24e6d711a5..a90def45bdf 100644
--- a/tests/_data/fixtures/Migrations/OrdersProductsMigration.php
+++ b/tests/_data/fixtures/Migrations/OrdersProductsMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class OrdersProductsMigration
diff --git a/tests/_data/fixtures/Migrations/ProductsMigration.php b/tests/_data/fixtures/Migrations/ProductsMigration.php
index 0548be0b418..83facdef0af 100644
--- a/tests/_data/fixtures/Migrations/ProductsMigration.php
+++ b/tests/_data/fixtures/Migrations/ProductsMigration.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class ProductsMigration
diff --git a/tests/_data/fixtures/Migrations/SettersMigration.php b/tests/_data/fixtures/Migrations/SettersMigration.php
index c4cafbe0e7f..a3dfc1ffd95 100644
--- a/tests/_data/fixtures/Migrations/SettersMigration.php
+++ b/tests/_data/fixtures/Migrations/SettersMigration.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class SettersMigration
diff --git a/tests/_data/fixtures/Migrations/SourcesMigration.php b/tests/_data/fixtures/Migrations/SourcesMigration.php
index 6f4613cfc86..5766420e9e4 100644
--- a/tests/_data/fixtures/Migrations/SourcesMigration.php
+++ b/tests/_data/fixtures/Migrations/SourcesMigration.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class SourcesMigration
diff --git a/tests/_data/fixtures/Migrations/StringPrimaryMigration.php b/tests/_data/fixtures/Migrations/StringPrimaryMigration.php
index 331ecf074ef..497b87ee1b9 100644
--- a/tests/_data/fixtures/Migrations/StringPrimaryMigration.php
+++ b/tests/_data/fixtures/Migrations/StringPrimaryMigration.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class StringPrimaryMigration
diff --git a/tests/_data/fixtures/Migrations/StuffMigration.php b/tests/_data/fixtures/Migrations/StuffMigration.php
index 0220e7b15cb..8dacd011e54 100644
--- a/tests/_data/fixtures/Migrations/StuffMigration.php
+++ b/tests/_data/fixtures/Migrations/StuffMigration.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Migrations;
+namespace Phalcon\Tests\Fixtures\Migrations;
 
 /**
  * Class StuffMigration
diff --git a/tests/_data/fixtures/Mvc/View/AfterRenderListener.php b/tests/_data/fixtures/Mvc/View/AfterRenderListener.php
index f99dec02b39..dc975083dde 100644
--- a/tests/_data/fixtures/Mvc/View/AfterRenderListener.php
+++ b/tests/_data/fixtures/Mvc/View/AfterRenderListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Mvc\View;
+namespace Phalcon\Tests\Fixtures\Mvc\View;
 
 use Phalcon\Events\Event;
 use Phalcon\Mvc\View;
diff --git a/tests/_data/fixtures/Mvc/View/Engine/Mustache.php b/tests/_data/fixtures/Mvc/View/Engine/Mustache.php
index 3a4636a7b1b..6bff290a3eb 100644
--- a/tests/_data/fixtures/Mvc/View/Engine/Mustache.php
+++ b/tests/_data/fixtures/Mvc/View/Engine/Mustache.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Mvc\View\Engine;
+namespace Phalcon\Tests\Fixtures\Mvc\View\Engine;
 
 use Mustache_Engine;
 use Phalcon\Di\DiInterface;
diff --git a/tests/_data/fixtures/Mvc/View/Engine/Twig.php b/tests/_data/fixtures/Mvc/View/Engine/Twig.php
index b57820bf14a..c3bd5aea6f9 100644
--- a/tests/_data/fixtures/Mvc/View/Engine/Twig.php
+++ b/tests/_data/fixtures/Mvc/View/Engine/Twig.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Mvc\View\Engine;
+namespace Phalcon\Tests\Fixtures\Mvc\View\Engine;
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\View\Engine\AbstractEngine;
diff --git a/tests/_data/fixtures/Mvc/View/IteratorObject.php b/tests/_data/fixtures/Mvc/View/IteratorObject.php
index 62cb3008067..56b904076e8 100644
--- a/tests/_data/fixtures/Mvc/View/IteratorObject.php
+++ b/tests/_data/fixtures/Mvc/View/IteratorObject.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Mvc\View;
+namespace Phalcon\Tests\Fixtures\Mvc\View;
 
 class IteratorObject implements \Iterator, \Countable
 {
diff --git a/tests/_data/fixtures/Paginator/Store.php b/tests/_data/fixtures/Paginator/Store.php
index 4153f113fff..4d81a42569c 100644
--- a/tests/_data/fixtures/Paginator/Store.php
+++ b/tests/_data/fixtures/Paginator/Store.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Paginator;
+namespace Phalcon\Tests\Fixtures\Paginator;
 
 use Phalcon\Paginator\Repository;
 
diff --git a/tests/_data/fixtures/Resultset.php b/tests/_data/fixtures/Resultset.php
index 85b95005834..e709c04ea53 100644
--- a/tests/_data/fixtures/Resultset.php
+++ b/tests/_data/fixtures/Resultset.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures;
+namespace Phalcon\Tests\Fixtures;
 
 class Resultset
 {
diff --git a/tests/_data/fixtures/Security/ExtendedBuilder.php b/tests/_data/fixtures/Security/ExtendedBuilder.php
index 4118bb9e7c7..6ad3fb89cc5 100644
--- a/tests/_data/fixtures/Security/ExtendedBuilder.php
+++ b/tests/_data/fixtures/Security/ExtendedBuilder.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Security;
+namespace Phalcon\Tests\Fixtures\Security;
 
 use Phalcon\Security\JWT\Builder;
 
 /**
  * Class ExtendedBuilder
  *
- * @package Phalcon\Test\Fixtures\Security
+ * @package Phalcon\Tests\Fixtures\Security
  */
 class ExtendedBuilder extends Builder
 {
diff --git a/tests/_data/fixtures/Service/HelloService.php b/tests/_data/fixtures/Service/HelloService.php
index 58be346e342..59e8daf04e3 100644
--- a/tests/_data/fixtures/Service/HelloService.php
+++ b/tests/_data/fixtures/Service/HelloService.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Service;
+namespace Phalcon\Tests\Fixtures\Service;
 
 /**
  * Class HelloService
diff --git a/tests/_data/fixtures/Session/ExtendedManager.php b/tests/_data/fixtures/Session/ExtendedManager.php
index 4d567710140..65b5cca6dd2 100644
--- a/tests/_data/fixtures/Session/ExtendedManager.php
+++ b/tests/_data/fixtures/Session/ExtendedManager.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Session;
+namespace Phalcon\Tests\Fixtures\Session;
 
 use Phalcon\Session\Adapter\Noop;
 use Phalcon\Session\Manager;
diff --git a/tests/_data/fixtures/Storage/Adapter/Libmemcached.php b/tests/_data/fixtures/Storage/Adapter/Libmemcached.php
index c28cf514cc3..34b231699c6 100644
--- a/tests/_data/fixtures/Storage/Adapter/Libmemcached.php
+++ b/tests/_data/fixtures/Storage/Adapter/Libmemcached.php
@@ -11,12 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Storage\Adapter;
+namespace Phalcon\Tests\Fixtures\Storage\Adapter;
 
+use DateInterval;
+use Exception;
 use Phalcon\Storage\Adapter\Libmemcached as StorageLibmemcached;
 
 /**
- * Phalcon\Test\Fixtures\Storage\Adapter
+ * Phalcon\Tests\Fixtures\Storage\Adapter
  *
  * Libmemcached adapter fixture
  */
@@ -28,10 +30,10 @@ public function getOptions(): array
     }
 
     /**
-     * @param \DateInterval|int|null $ttl
+     * @param DateInterval|int|null $ttl
      *
-     * @return DateIntervalint|null
-     * @throws \Exception
+     * @return int
+     * @throws Exception
      */
     public function getTtl($ttl = null): int
     {
diff --git a/tests/_data/fixtures/Support/Dump/ClassProperties.php b/tests/_data/fixtures/Support/Dump/ClassProperties.php
new file mode 100644
index 00000000000..8d394c46032
--- /dev/null
+++ b/tests/_data/fixtures/Support/Dump/ClassProperties.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Fixtures\Support\Dump;
+
+/**
+ * Class ClassProperties
+ */
+class ClassProperties
+{
+    public $foo = 1;
+
+    protected $bar = 2;
+
+    private $baz = 3;
+}
diff --git a/tests/_data/fixtures/Support/Dump/class_properties.txt b/tests/_data/fixtures/Support/Dump/class_properties.txt
new file mode 100644
index 00000000000..e7ff2aa90d3
--- /dev/null
+++ b/tests/_data/fixtures/Support/Dump/class_properties.txt
@@ -0,0 +1,7 @@
+Object Phalcon\Tests\Fixtures\Support\Dump\ClassProperties (
+  ->foo (public) = Integer (1)
+  ->bar (protected) = Integer (2)
+  ->baz (private) = Integer (3)
+  Phalcon\Tests\Fixtures\Support\Dump\ClassProperties methods: (0) (
+  )
+)
diff --git a/tests/_data/fixtures/Support/Dump/variable_name_output.txt b/tests/_data/fixtures/Support/Dump/variable_name_output.txt
new file mode 100644
index 00000000000..a5c960fccb1
--- /dev/null
+++ b/tests/_data/fixtures/Support/Dump/variable_name_output.txt
@@ -0,0 +1 @@
+<pre style="background-color:#f3f3f3; font-size:11px; padding:10px; border:1px solid #ccc; text-align:left; color:#333">super <b style="color:teal">String</b> (<span style="color:teal">5</span>) "<span style="color:teal">value</span>"</pre>
diff --git a/tests/_data/fixtures/Support/Dump/variable_output.txt b/tests/_data/fixtures/Support/Dump/variable_output.txt
new file mode 100644
index 00000000000..00a8fe619de
--- /dev/null
+++ b/tests/_data/fixtures/Support/Dump/variable_output.txt
@@ -0,0 +1 @@
+<pre style="background-color:#f3f3f3; font-size:11px; padding:10px; border:1px solid #ccc; text-align:left; color:#333"><b style="color:teal">String</b> (<span style="color:teal">5</span>) "<span style="color:teal">value</span>"</pre>
diff --git a/tests/_data/fixtures/Support/Dump/variables_output.txt b/tests/_data/fixtures/Support/Dump/variables_output.txt
new file mode 100644
index 00000000000..45b7e1b9270
--- /dev/null
+++ b/tests/_data/fixtures/Support/Dump/variables_output.txt
@@ -0,0 +1,6 @@
+<pre style="background-color:#f3f3f3; font-size:11px; padding:10px; border:1px solid #ccc; text-align:left; color:#333">var 0 <b style="color:teal">String</b> (<span style="color:teal">6</span>) "<span style="color:teal">string</span>"</pre><pre style="background-color:#f3f3f3; font-size:11px; padding:10px; border:1px solid #ccc; text-align:left; color:#333">var 1 <b style="color:red">Array</b> (<span style="color:red">1</span>) (
+  [<span style="color:red">key</span>] => <b style="color:teal">String</b> (<span style="color:teal">5</span>) "<span style="color:teal">value</span>"
+)</pre><pre style="background-color:#f3f3f3; font-size:11px; padding:10px; border:1px solid #ccc; text-align:left; color:#333">var 2 <b style="color:purple">Object</b> stdClass (
+  stdClass <b style="color:purple">methods</b>: (<span style="color:purple">0</span>) (
+  )
+)</pre>
diff --git a/tests/_data/fixtures/Tasks/EchoTask.php b/tests/_data/fixtures/Tasks/EchoTask.php
index 089e8c992fa..82df5760540 100644
--- a/tests/_data/fixtures/Tasks/EchoTask.php
+++ b/tests/_data/fixtures/Tasks/EchoTask.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Tasks;
+namespace Phalcon\Tests\Fixtures\Tasks;
 
 class EchoTask extends \Phalcon\Cli\Task
 {
diff --git a/tests/_data/fixtures/Tasks/Issue787Task.php b/tests/_data/fixtures/Tasks/Issue787Task.php
index d78a28943af..bdd57317c0e 100644
--- a/tests/_data/fixtures/Tasks/Issue787Task.php
+++ b/tests/_data/fixtures/Tasks/Issue787Task.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Tasks;
+namespace Phalcon\Tests\Fixtures\Tasks;
 
 use Phalcon\Cli\Task;
 
diff --git a/tests/_data/fixtures/Tasks/MainTask.php b/tests/_data/fixtures/Tasks/MainTask.php
index b947e6aacac..d05a00b6cb9 100644
--- a/tests/_data/fixtures/Tasks/MainTask.php
+++ b/tests/_data/fixtures/Tasks/MainTask.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Tasks;
+namespace Phalcon\Tests\Fixtures\Tasks;
 
 class MainTask extends \Phalcon\Cli\Task
 {
diff --git a/tests/_data/fixtures/Tasks/OnConstructTask.php b/tests/_data/fixtures/Tasks/OnConstructTask.php
index b672de7bfc2..c4068158b62 100644
--- a/tests/_data/fixtures/Tasks/OnConstructTask.php
+++ b/tests/_data/fixtures/Tasks/OnConstructTask.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Tasks;
+namespace Phalcon\Tests\Fixtures\Tasks;
 
 class OnConstructTask extends \Phalcon\Cli\Task
 {
diff --git a/tests/_data/fixtures/Tasks/ParamsTask.php b/tests/_data/fixtures/Tasks/ParamsTask.php
index c8f9270d9f1..7454e2f1510 100644
--- a/tests/_data/fixtures/Tasks/ParamsTask.php
+++ b/tests/_data/fixtures/Tasks/ParamsTask.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Tasks;
+namespace Phalcon\Tests\Fixtures\Tasks;
 
 class ParamsTask extends \Phalcon\Cli\Task
 {
diff --git a/tests/_data/fixtures/Traits/ApcuTrait.php b/tests/_data/fixtures/Traits/ApcuTrait.php
index c64deb239c4..5249421afbb 100644
--- a/tests/_data/fixtures/Traits/ApcuTrait.php
+++ b/tests/_data/fixtures/Traits/ApcuTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Traits/ConfigTrait.php b/tests/_data/fixtures/Traits/ConfigTrait.php
index b943b5c112c..3badf964c52 100644
--- a/tests/_data/fixtures/Traits/ConfigTrait.php
+++ b/tests/_data/fixtures/Traits/ConfigTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use Phalcon\Config;
 use Phalcon\Config\Adapter\Grouped;
diff --git a/tests/_data/fixtures/Traits/CookieTrait.php b/tests/_data/fixtures/Traits/CookieTrait.php
index 51cb45c09fd..bb5d9b13799 100644
--- a/tests/_data/fixtures/Traits/CookieTrait.php
+++ b/tests/_data/fixtures/Traits/CookieTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use RuntimeException;
 
diff --git a/tests/_data/fixtures/Traits/Db/MysqlTrait.php b/tests/_data/fixtures/Traits/Db/MysqlTrait.php
index f57284e827d..9c77e69c92d 100644
--- a/tests/_data/fixtures/Traits/Db/MysqlTrait.php
+++ b/tests/_data/fixtures/Traits/Db/MysqlTrait.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits\Db;
+namespace Phalcon\Tests\Fixtures\Traits\Db;
 
 use Phalcon\Db\Index;
 use Phalcon\Db\Reference;
@@ -18,7 +18,7 @@
 /**
  * Trait MysqlTrait
  *
- * @package Phalcon\Test\Fixtures\Traits\Db
+ * @package Phalcon\Tests\Fixtures\Traits\Db
  */
 trait MysqlTrait
 {
diff --git a/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php b/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php
index 154f306685d..2e84f4e6c03 100644
--- a/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php
+++ b/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits\Db;
+namespace Phalcon\Tests\Fixtures\Traits\Db;
 
 use Phalcon\Db\Column;
 use Phalcon\Db\Index;
@@ -20,7 +20,7 @@
 /**
  * Trait PostgresqlTrait
  *
- * @package Phalcon\Test\Fixtures\Traits\Db
+ * @package Phalcon\Tests\Fixtures\Traits\Db
  */
 trait PostgresqlTrait
 {
diff --git a/tests/_data/fixtures/Traits/DbTrait.php b/tests/_data/fixtures/Traits/DbTrait.php
index c03a4572797..05e6142e0e0 100644
--- a/tests/_data/fixtures/Traits/DbTrait.php
+++ b/tests/_data/fixtures/Traits/DbTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use Phalcon\Db\Column;
 
diff --git a/tests/_data/fixtures/Traits/DiTrait.php b/tests/_data/fixtures/Traits/DiTrait.php
index 2466971e2a3..926eed49377 100644
--- a/tests/_data/fixtures/Traits/DiTrait.php
+++ b/tests/_data/fixtures/Traits/DiTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/_data/fixtures/Traits/DialectTrait.php b/tests/_data/fixtures/Traits/DialectTrait.php
index 2c3dc9621b3..32aed51381a 100644
--- a/tests/_data/fixtures/Traits/DialectTrait.php
+++ b/tests/_data/fixtures/Traits/DialectTrait.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use Phalcon\Db\Column;
 use Phalcon\Db\Index;
diff --git a/tests/_data/fixtures/Traits/FactoryTrait.php b/tests/_data/fixtures/Traits/FactoryTrait.php
index f7b1c8c8ecf..31aaac62928 100644
--- a/tests/_data/fixtures/Traits/FactoryTrait.php
+++ b/tests/_data/fixtures/Traits/FactoryTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use Phalcon\Config;
 use Phalcon\Config\Adapter\Ini;
diff --git a/tests/_data/fixtures/Traits/GdTrait.php b/tests/_data/fixtures/Traits/GdTrait.php
index 06dcdf74ea5..dd2719e40a1 100644
--- a/tests/_data/fixtures/Traits/GdTrait.php
+++ b/tests/_data/fixtures/Traits/GdTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Traits/ImagickTrait.php b/tests/_data/fixtures/Traits/ImagickTrait.php
index 3803d1a5044..ba801a3c7ce 100644
--- a/tests/_data/fixtures/Traits/ImagickTrait.php
+++ b/tests/_data/fixtures/Traits/ImagickTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Traits/JWTTrait.php b/tests/_data/fixtures/Traits/JWTTrait.php
index 0b38f8630a0..bd2821234b0 100644
--- a/tests/_data/fixtures/Traits/JWTTrait.php
+++ b/tests/_data/fixtures/Traits/JWTTrait.php
@@ -9,13 +9,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Signer\Hmac;
 use Phalcon\Security\JWT\Token\Token;
-use Phalcon\Test\Fixtures\Security\ExtendedBuilder;
+use Phalcon\Tests\Fixtures\Security\ExtendedBuilder;
 
 trait JWTTrait
 {
diff --git a/tests/_data/fixtures/Traits/LibmemcachedTrait.php b/tests/_data/fixtures/Traits/LibmemcachedTrait.php
index 4bf1cad3fbc..18969933b89 100644
--- a/tests/_data/fixtures/Traits/LibmemcachedTrait.php
+++ b/tests/_data/fixtures/Traits/LibmemcachedTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Traits/LoaderTrait.php b/tests/_data/fixtures/Traits/LoaderTrait.php
index 6a8ddf4c51e..9396cda7219 100644
--- a/tests/_data/fixtures/Traits/LoaderTrait.php
+++ b/tests/_data/fixtures/Traits/LoaderTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Traits/LoggerTrait.php b/tests/_data/fixtures/Traits/LoggerTrait.php
index 7c53dabf104..c1b3dc99f3a 100644
--- a/tests/_data/fixtures/Traits/LoggerTrait.php
+++ b/tests/_data/fixtures/Traits/LoggerTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use DateTime;
 use Phalcon\Logger;
diff --git a/tests/_data/fixtures/Traits/RecordsTrait.php b/tests/_data/fixtures/Traits/RecordsTrait.php
index 7f650e790bd..3e13c4a588e 100644
--- a/tests/_data/fixtures/Traits/RecordsTrait.php
+++ b/tests/_data/fixtures/Traits/RecordsTrait.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 use PHPUnit\Framework\Assert;
 
 use function uniqid;
diff --git a/tests/_data/fixtures/Traits/RedisTrait.php b/tests/_data/fixtures/Traits/RedisTrait.php
index ef23f1fb635..1dfec736e5d 100644
--- a/tests/_data/fixtures/Traits/RedisTrait.php
+++ b/tests/_data/fixtures/Traits/RedisTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 
diff --git a/tests/_data/fixtures/Traits/RouterTrait.php b/tests/_data/fixtures/Traits/RouterTrait.php
index 7df45244ecc..3f5c1252219 100644
--- a/tests/_data/fixtures/Traits/RouterTrait.php
+++ b/tests/_data/fixtures/Traits/RouterTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use Phalcon\Di;
 use Phalcon\Http\Request;
@@ -101,7 +101,7 @@ protected function getRouterAndSetRoutesAndHostNames(array $settings, bool $defa
 
     /**
      * get router and set params for
-     * Phalcon\Test\Unit\Mvc\RouterTest::testUsingRouteConverters() test
+     * Phalcon\Tests\Unit\Mvc\RouterTest::testUsingRouteConverters() test
      */
     protected function getRouterAndSetData(): Router
     {
diff --git a/tests/_data/fixtures/Traits/TranslateArrayTrait.php b/tests/_data/fixtures/Traits/TranslateArrayTrait.php
index 2c55f23c4db..046fe3e6199 100644
--- a/tests/_data/fixtures/Traits/TranslateArrayTrait.php
+++ b/tests/_data/fixtures/Traits/TranslateArrayTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 trait TranslateArrayTrait
 {
diff --git a/tests/_data/fixtures/Traits/TranslateCsvTrait.php b/tests/_data/fixtures/Traits/TranslateCsvTrait.php
index 42e989ed9eb..bb350e8ee60 100644
--- a/tests/_data/fixtures/Traits/TranslateCsvTrait.php
+++ b/tests/_data/fixtures/Traits/TranslateCsvTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use function dataDir;
 
diff --git a/tests/_data/fixtures/Traits/TranslateGettextTrait.php b/tests/_data/fixtures/Traits/TranslateGettextTrait.php
index e044fb7e5f4..4b887012586 100644
--- a/tests/_data/fixtures/Traits/TranslateGettextTrait.php
+++ b/tests/_data/fixtures/Traits/TranslateGettextTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use UnitTester;
 use function dataDir;
diff --git a/tests/_data/fixtures/Traits/ValidationTrait.php b/tests/_data/fixtures/Traits/ValidationTrait.php
index e3fb0dc219a..250a87e90b5 100644
--- a/tests/_data/fixtures/Traits/ValidationTrait.php
+++ b/tests/_data/fixtures/Traits/ValidationTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use IntegrationTester;
 use Phalcon\Validation\ValidatorInterface;
diff --git a/tests/_data/fixtures/Traits/VersionTrait.php b/tests/_data/fixtures/Traits/VersionTrait.php
index 34b7fcc5bea..e97030f0687 100644
--- a/tests/_data/fixtures/Traits/VersionTrait.php
+++ b/tests/_data/fixtures/Traits/VersionTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 trait VersionTrait
 {
diff --git a/tests/_data/fixtures/Traits/ViewTrait.php b/tests/_data/fixtures/Traits/ViewTrait.php
index 7f2da05debe..e323057efe8 100644
--- a/tests/_data/fixtures/Traits/ViewTrait.php
+++ b/tests/_data/fixtures/Traits/ViewTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Traits;
+namespace Phalcon\Tests\Fixtures\Traits;
 
 use DirectoryIterator;
 use Phalcon\Mvc\View;
diff --git a/tests/_data/fixtures/Translate/Adapter/NativeAdapter.php b/tests/_data/fixtures/Translate/Adapter/NativeAdapter.php
index d3e89281658..d550bf73655 100644
--- a/tests/_data/fixtures/Translate/Adapter/NativeAdapter.php
+++ b/tests/_data/fixtures/Translate/Adapter/NativeAdapter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Fixtures\Translate\Adapter;
+namespace Phalcon\Tests\Fixtures\Translate\Adapter;
 
 use Phalcon\Translate\Adapter\NativeArray;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Abonnes.php b/tests/_data/fixtures/_tocheck-models/Abonnes.php
index 0670962cc5d..c329c2aab4e 100644
--- a/tests/_data/fixtures/_tocheck-models/Abonnes.php
+++ b/tests/_data/fixtures/_tocheck-models/Abonnes.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Messages\Message;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/_tocheck-models/AlbumORama/Albums.php b/tests/_data/fixtures/_tocheck-models/AlbumORama/Albums.php
index 7925dbcafbd..e327d95f5e0 100644
--- a/tests/_data/fixtures/_tocheck-models/AlbumORama/Albums.php
+++ b/tests/_data/fixtures/_tocheck-models/AlbumORama/Albums.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\AlbumORama;
+namespace Phalcon\Tests\Models\AlbumORama;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/AlbumORama/Artists.php b/tests/_data/fixtures/_tocheck-models/AlbumORama/Artists.php
index 4dd54d2023d..4c8525e3ee8 100644
--- a/tests/_data/fixtures/_tocheck-models/AlbumORama/Artists.php
+++ b/tests/_data/fixtures/_tocheck-models/AlbumORama/Artists.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\AlbumORama;
+namespace Phalcon\Tests\Models\AlbumORama;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/AlbumORama/Songs.php b/tests/_data/fixtures/_tocheck-models/AlbumORama/Songs.php
index 56c656f1868..41d286c36cd 100644
--- a/tests/_data/fixtures/_tocheck-models/AlbumORama/Songs.php
+++ b/tests/_data/fixtures/_tocheck-models/AlbumORama/Songs.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\AlbumORama;
+namespace Phalcon\Tests\Models\AlbumORama;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Annotations/Robot.php b/tests/_data/fixtures/_tocheck-models/Annotations/Robot.php
index fc2e1bf7acc..dd7c775e749 100644
--- a/tests/_data/fixtures/_tocheck-models/Annotations/Robot.php
+++ b/tests/_data/fixtures/_tocheck-models/Annotations/Robot.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Annotations;
+namespace Phalcon\Tests\Models\Annotations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/BodyParts/Body.php b/tests/_data/fixtures/_tocheck-models/BodyParts/Body.php
index a678772e2e0..8a0b4fb9a11 100644
--- a/tests/_data/fixtures/_tocheck-models/BodyParts/Body.php
+++ b/tests/_data/fixtures/_tocheck-models/BodyParts/Body.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\BodyParts;
+namespace Phalcon\Tests\Models\BodyParts;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/BodyParts/Head.php b/tests/_data/fixtures/_tocheck-models/BodyParts/Head.php
index 37f4e8f645a..80f6dc864ab 100644
--- a/tests/_data/fixtures/_tocheck-models/BodyParts/Head.php
+++ b/tests/_data/fixtures/_tocheck-models/BodyParts/Head.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\BodyParts;
+namespace Phalcon\Tests\Models\BodyParts;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Boutique/Robots.php b/tests/_data/fixtures/_tocheck-models/Boutique/Robots.php
index 2a494948bf9..3a6a09fd50f 100644
--- a/tests/_data/fixtures/_tocheck-models/Boutique/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Boutique/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Boutique;
+namespace Phalcon\Tests\Models\Boutique;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Boutique/Robotters.php b/tests/_data/fixtures/_tocheck-models/Boutique/Robotters.php
index 3bd8be5e65a..9633f14646c 100644
--- a/tests/_data/fixtures/_tocheck-models/Boutique/Robotters.php
+++ b/tests/_data/fixtures/_tocheck-models/Boutique/Robotters.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Boutique;
+namespace Phalcon\Tests\Models\Boutique;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Cacheable/Model.php b/tests/_data/fixtures/_tocheck-models/Cacheable/Model.php
index a599e74f796..a5682d669ad 100644
--- a/tests/_data/fixtures/_tocheck-models/Cacheable/Model.php
+++ b/tests/_data/fixtures/_tocheck-models/Cacheable/Model.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Cacheable;
+namespace Phalcon\Tests\Models\Cacheable;
 
 use Phalcon\Mvc\Model as PhalconModel;
 use Phalcon\Mvc\ModelInterface;
diff --git a/tests/_data/fixtures/_tocheck-models/Cacheable/Parts.php b/tests/_data/fixtures/_tocheck-models/Cacheable/Parts.php
index 7de9701e441..2162a2aba74 100644
--- a/tests/_data/fixtures/_tocheck-models/Cacheable/Parts.php
+++ b/tests/_data/fixtures/_tocheck-models/Cacheable/Parts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Cacheable;
+namespace Phalcon\Tests\Models\Cacheable;
 
 use Phalcon\Mvc\Model as PhalconModel;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Cacheable/Robots.php b/tests/_data/fixtures/_tocheck-models/Cacheable/Robots.php
index 84f86fe2070..0712cfc1c45 100644
--- a/tests/_data/fixtures/_tocheck-models/Cacheable/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Cacheable/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Cacheable;
+namespace Phalcon\Tests\Models\Cacheable;
 
 use Phalcon\Mvc\Model as PhalconModel;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Cacheable/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/Cacheable/RobotsParts.php
index 826d884a994..181da400380 100644
--- a/tests/_data/fixtures/_tocheck-models/Cacheable/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Cacheable/RobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Cacheable;
+namespace Phalcon\Tests\Models\Cacheable;
 
 use Phalcon\Mvc\Model as PhalconModel;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Childs.php b/tests/_data/fixtures/_tocheck-models/Childs.php
index 8d9f7c66cb3..7ed2022af6b 100644
--- a/tests/_data/fixtures/_tocheck-models/Childs.php
+++ b/tests/_data/fixtures/_tocheck-models/Childs.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Customers1.php b/tests/_data/fixtures/_tocheck-models/Customers1.php
index faf689eda5e..04d31d0adc9 100644
--- a/tests/_data/fixtures/_tocheck-models/Customers1.php
+++ b/tests/_data/fixtures/_tocheck-models/Customers1.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset\Simple;
diff --git a/tests/_data/fixtures/_tocheck-models/Deles.php b/tests/_data/fixtures/_tocheck-models/Deles.php
index f1aaa9307c7..78b1b09dd78 100644
--- a/tests/_data/fixtures/_tocheck-models/Deles.php
+++ b/tests/_data/fixtures/_tocheck-models/Deles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Dynamic/Personas.php b/tests/_data/fixtures/_tocheck-models/Dynamic/Personas.php
index 3f64e3a102c..a62bd50dff4 100644
--- a/tests/_data/fixtures/_tocheck-models/Dynamic/Personas.php
+++ b/tests/_data/fixtures/_tocheck-models/Dynamic/Personas.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Dynamic;
+namespace Phalcon\Tests\Models\Dynamic;
 
 use Phalcon\Mvc\Model as PhalconModel;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Dynamic/Personers.php b/tests/_data/fixtures/_tocheck-models/Dynamic/Personers.php
index 17c575d2778..fdbafa37347 100644
--- a/tests/_data/fixtures/_tocheck-models/Dynamic/Personers.php
+++ b/tests/_data/fixtures/_tocheck-models/Dynamic/Personers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Dynamic;
+namespace Phalcon\Tests\Models\Dynamic;
 
 use Phalcon\Mvc\Model as PhalconModel;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
diff --git a/tests/_data/fixtures/_tocheck-models/Dynamic/Robots.php b/tests/_data/fixtures/_tocheck-models/Dynamic/Robots.php
index ae6eb420ac9..724a3866c25 100644
--- a/tests/_data/fixtures/_tocheck-models/Dynamic/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Dynamic/Robots.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Dynamic;
+namespace Phalcon\Tests\Models\Dynamic;
 
 use Phalcon\Mvc\Model as PhalconModel;
-use Phalcon\Test\Models\RobotsParts;
+use Phalcon\Tests\Models\RobotsParts;
 
 /**
  * @property int    $id
diff --git a/tests/_data/fixtures/_tocheck-models/GossipRobots.php b/tests/_data/fixtures/_tocheck-models/GossipRobots.php
index 2c15d0d6611..b63275de262 100644
--- a/tests/_data/fixtures/_tocheck-models/GossipRobots.php
+++ b/tests/_data/fixtures/_tocheck-models/GossipRobots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/I1534.php b/tests/_data/fixtures/_tocheck-models/I1534.php
index 3faa9ab6b12..289a1596ca5 100644
--- a/tests/_data/fixtures/_tocheck-models/I1534.php
+++ b/tests/_data/fixtures/_tocheck-models/I1534.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/InvoicesWithColumnMap.php b/tests/_data/fixtures/_tocheck-models/InvoicesWithColumnMap.php
index 93228ce1aab..7402e04f342 100644
--- a/tests/_data/fixtures/_tocheck-models/InvoicesWithColumnMap.php
+++ b/tests/_data/fixtures/_tocheck-models/InvoicesWithColumnMap.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Language.php b/tests/_data/fixtures/_tocheck-models/Language.php
index ac20ed48bda..722b69c27d6 100644
--- a/tests/_data/fixtures/_tocheck-models/Language.php
+++ b/tests/_data/fixtures/_tocheck-models/Language.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset\Simple;
diff --git a/tests/_data/fixtures/_tocheck-models/LanguageI18n.php b/tests/_data/fixtures/_tocheck-models/LanguageI18n.php
index dc4b661643f..559886d1a10 100644
--- a/tests/_data/fixtures/_tocheck-models/LanguageI18n.php
+++ b/tests/_data/fixtures/_tocheck-models/LanguageI18n.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/ModelWithStringField.php b/tests/_data/fixtures/_tocheck-models/ModelWithStringField.php
index d819a102331..f61b223bed7 100644
--- a/tests/_data/fixtures/_tocheck-models/ModelWithStringField.php
+++ b/tests/_data/fixtures/_tocheck-models/ModelWithStringField.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/News/Subscribers.php b/tests/_data/fixtures/_tocheck-models/News/Subscribers.php
index 612432d0047..9e7fbaa81a0 100644
--- a/tests/_data/fixtures/_tocheck-models/News/Subscribers.php
+++ b/tests/_data/fixtures/_tocheck-models/News/Subscribers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\News;
+namespace Phalcon\Tests\Models\News;
 
 use Phalcon\Mvc\Model as PhalconModel;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
diff --git a/tests/_data/fixtures/_tocheck-models/PackageDetails.php b/tests/_data/fixtures/_tocheck-models/PackageDetails.php
index 5ab06381005..c26f09026a6 100644
--- a/tests/_data/fixtures/_tocheck-models/PackageDetails.php
+++ b/tests/_data/fixtures/_tocheck-models/PackageDetails.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Packages.php b/tests/_data/fixtures/_tocheck-models/Packages.php
index 31236998669..37cfd0217ce 100644
--- a/tests/_data/fixtures/_tocheck-models/Packages.php
+++ b/tests/_data/fixtures/_tocheck-models/Packages.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset;
diff --git a/tests/_data/fixtures/_tocheck-models/Parts.php b/tests/_data/fixtures/_tocheck-models/Parts.php
index 2bb8ef84209..c0ce153d01d 100644
--- a/tests/_data/fixtures/_tocheck-models/Parts.php
+++ b/tests/_data/fixtures/_tocheck-models/Parts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Parts2.php b/tests/_data/fixtures/_tocheck-models/Parts2.php
index 28638035fca..c0933bd90bd 100644
--- a/tests/_data/fixtures/_tocheck-models/Parts2.php
+++ b/tests/_data/fixtures/_tocheck-models/Parts2.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Events\Manager;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/_tocheck-models/People.php b/tests/_data/fixtures/_tocheck-models/People.php
index 42332fb8ece..127ea619776 100644
--- a/tests/_data/fixtures/_tocheck-models/People.php
+++ b/tests/_data/fixtures/_tocheck-models/People.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Personas.php b/tests/_data/fixtures/_tocheck-models/Personas.php
index 9508e04c96e..d956119fe44 100644
--- a/tests/_data/fixtures/_tocheck-models/Personas.php
+++ b/tests/_data/fixtures/_tocheck-models/Personas.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Personers.php b/tests/_data/fixtures/_tocheck-models/Personers.php
index dc7a4bace86..ebbd8d9dbb7 100644
--- a/tests/_data/fixtures/_tocheck-models/Personers.php
+++ b/tests/_data/fixtures/_tocheck-models/Personers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Personnes.php b/tests/_data/fixtures/_tocheck-models/Personnes.php
index 425fb45cd18..3206da72e14 100644
--- a/tests/_data/fixtures/_tocheck-models/Personnes.php
+++ b/tests/_data/fixtures/_tocheck-models/Personnes.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Pessoas.php b/tests/_data/fixtures/_tocheck-models/Pessoas.php
index 97cfd7f0607..ba8f450390c 100644
--- a/tests/_data/fixtures/_tocheck-models/Pessoas.php
+++ b/tests/_data/fixtures/_tocheck-models/Pessoas.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Prueba.php b/tests/_data/fixtures/_tocheck-models/Prueba.php
index c1b75443756..bc6439de4c4 100644
--- a/tests/_data/fixtures/_tocheck-models/Prueba.php
+++ b/tests/_data/fixtures/_tocheck-models/Prueba.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Deles.php b/tests/_data/fixtures/_tocheck-models/Relations/Deles.php
index 00a34a8bfdc..acedae29a53 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Deles.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Deles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/M2MParts.php b/tests/_data/fixtures/_tocheck-models/Relations/M2MParts.php
index 3b1335ef53d..07a8f6049ad 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/M2MParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/M2MParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/M2MRobots.php b/tests/_data/fixtures/_tocheck-models/Relations/M2MRobots.php
index d2ad51913e9..52f6034065d 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/M2MRobots.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/M2MRobots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/M2MRobotsParts.php b/tests/_data/fixtures/_tocheck-models/Relations/M2MRobotsParts.php
index e8dc79f1b91..b01cfc68933 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/M2MRobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/M2MRobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/RelationsParts.php b/tests/_data/fixtures/_tocheck-models/Relations/RelationsParts.php
index 8cfd4a34cde..715bedbd753 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/RelationsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/RelationsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobots.php b/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobots.php
index adef8eb553d..13c8550944b 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobots.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobotsParts.php b/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobotsParts.php
index 888872be4ee..b7cd6dd4e96 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/RelationsRobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Robots.php b/tests/_data/fixtures/_tocheck-models/Relations/Robots.php
index 140dea65e1b..66f88950623 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/Relations/RobotsParts.php
index 0a93ad514a0..6fce0230960 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/RobotsParts.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Row;
 
 /**
- * Phalcon\Test\Models\Relations\RobotsParts
+ * Phalcon\Tests\Models\Relations\RobotsParts
  *
  * @method static RobotsParts findFirst($parameters = null)
  * @method Row getRobots($parameters = null)
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Robotters.php b/tests/_data/fixtures/_tocheck-models/Relations/Robotters.php
index fb480922be2..9fb5538a5fe 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Robotters.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Robotters.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/RobottersDeles.php b/tests/_data/fixtures/_tocheck-models/Relations/RobottersDeles.php
index a9ee59eea7b..75b250ddd2c 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/RobottersDeles.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/RobottersDeles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations;
+namespace Phalcon\Tests\Models\Relations;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/Deles.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/Deles.php
index 839e6b17204..f109bea903f 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/Deles.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/Deles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/Parts.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/Parts.php
index b3958691ab4..3807ea42774 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/Parts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/Parts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/Products.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/Products.php
index 1615835aa7a..7dd30393b8a 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/Products.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/Products.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Db\Column;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/Robots.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/Robots.php
index 1bf562f7d0f..bebe9401c7c 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/RobotsParts.php
index 83127c3832b..d084ca10655 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/RobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/Robotters.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/Robotters.php
index e84b568cb31..5096122bfb9 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/Robotters.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/Robotters.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Relations/Some/RobottersDeles.php b/tests/_data/fixtures/_tocheck-models/Relations/Some/RobottersDeles.php
index f1e966daf2a..6f752aab24f 100644
--- a/tests/_data/fixtures/_tocheck-models/Relations/Some/RobottersDeles.php
+++ b/tests/_data/fixtures/_tocheck-models/Relations/Some/RobottersDeles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Relations\Some;
+namespace Phalcon\Tests\Models\Relations\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Robos.php b/tests/_data/fixtures/_tocheck-models/Robos.php
index 522d49c5862..3fd13b4d4b5 100644
--- a/tests/_data/fixtures/_tocheck-models/Robos.php
+++ b/tests/_data/fixtures/_tocheck-models/Robos.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Robots.php b/tests/_data/fixtures/_tocheck-models/Robots.php
index 582cd0b3635..ba130b32fbc 100644
--- a/tests/_data/fixtures/_tocheck-models/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Robots2.php b/tests/_data/fixtures/_tocheck-models/Robots2.php
index 7e20f6a9ca9..952ebefce08 100644
--- a/tests/_data/fixtures/_tocheck-models/Robots2.php
+++ b/tests/_data/fixtures/_tocheck-models/Robots2.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/RobotsExtended.php b/tests/_data/fixtures/_tocheck-models/RobotsExtended.php
index 6dbfd5e1723..bf543adc84a 100644
--- a/tests/_data/fixtures/_tocheck-models/RobotsExtended.php
+++ b/tests/_data/fixtures/_tocheck-models/RobotsExtended.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\ModelInterface;
 
diff --git a/tests/_data/fixtures/_tocheck-models/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/RobotsParts.php
index 594b6b0a975..1343e8edd9e 100644
--- a/tests/_data/fixtures/_tocheck-models/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/RobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/RobotsReusable.php b/tests/_data/fixtures/_tocheck-models/RobotsReusable.php
index 7e730c669c8..cc77eb07844 100644
--- a/tests/_data/fixtures/_tocheck-models/RobotsReusable.php
+++ b/tests/_data/fixtures/_tocheck-models/RobotsReusable.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Robotters.php b/tests/_data/fixtures/_tocheck-models/Robotters.php
index f111c0ed195..ac142851ebc 100644
--- a/tests/_data/fixtures/_tocheck-models/Robotters.php
+++ b/tests/_data/fixtures/_tocheck-models/Robotters.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/RobottersDeles.php b/tests/_data/fixtures/_tocheck-models/RobottersDeles.php
index f0c2a10ec95..220fdf76a07 100644
--- a/tests/_data/fixtures/_tocheck-models/RobottersDeles.php
+++ b/tests/_data/fixtures/_tocheck-models/RobottersDeles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Robotto.php b/tests/_data/fixtures/_tocheck-models/Robotto.php
index e801fae8b68..45cb6d3558c 100644
--- a/tests/_data/fixtures/_tocheck-models/Robotto.php
+++ b/tests/_data/fixtures/_tocheck-models/Robotto.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Db\Column;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/_tocheck-models/Select.php b/tests/_data/fixtures/_tocheck-models/Select.php
index ae98d31a11a..2444d3347ed 100644
--- a/tests/_data/fixtures/_tocheck-models/Select.php
+++ b/tests/_data/fixtures/_tocheck-models/Select.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/Parts.php b/tests/_data/fixtures/_tocheck-models/Snapshot/Parts.php
index e714b3f7d0c..35330c85e8f 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/Parts.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/Parts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/Personas.php b/tests/_data/fixtures/_tocheck-models/Snapshot/Personas.php
index bbe8099e154..d981cd71cd0 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/Personas.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/Personas.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/Requests.php b/tests/_data/fixtures/_tocheck-models/Snapshot/Requests.php
index 8cf39ea5563..e73102dfa60 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/Requests.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/Requests.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/Robots.php b/tests/_data/fixtures/_tocheck-models/Snapshot/Robots.php
index c586fba140a..3cee5ea0aaf 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/Snapshot/RobotsParts.php
index cd75e0b9685..f6886d88556 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/RobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/Robotters.php b/tests/_data/fixtures/_tocheck-models/Snapshot/Robotters.php
index 366fa8daf67..ac2ce0b1289 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/Robotters.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/Robotters.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Snapshot/Subscribers.php b/tests/_data/fixtures/_tocheck-models/Snapshot/Subscribers.php
index adf2f2309c6..1ca92d7e577 100644
--- a/tests/_data/fixtures/_tocheck-models/Snapshot/Subscribers.php
+++ b/tests/_data/fixtures/_tocheck-models/Snapshot/Subscribers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Snapshot;
+namespace Phalcon\Tests\Models\Snapshot;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
diff --git a/tests/_data/fixtures/_tocheck-models/Some/Deles.php b/tests/_data/fixtures/_tocheck-models/Some/Deles.php
index 39b6e7a1ddc..c4102dd9c2f 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/Deles.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/Deles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Some/Parts.php b/tests/_data/fixtures/_tocheck-models/Some/Parts.php
index 247e91c4acc..c2b9a518dbb 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/Parts.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/Parts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Some/Products.php b/tests/_data/fixtures/_tocheck-models/Some/Products.php
index ee7a2a222a5..d6795a66021 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/Products.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/Products.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Db\Column;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/_tocheck-models/Some/Robots.php b/tests/_data/fixtures/_tocheck-models/Some/Robots.php
index 64ad6cddc98..673ff05a659 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Some/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/Some/RobotsParts.php
index e1d49c49504..c90ec178b8e 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/RobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Some/Robotters.php b/tests/_data/fixtures/_tocheck-models/Some/Robotters.php
index 4e735b0360d..eae1070a019 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/Robotters.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/Robotters.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Some/RobottersDeles.php b/tests/_data/fixtures/_tocheck-models/Some/RobottersDeles.php
index d670b0a99ad..e7c6e38edc6 100644
--- a/tests/_data/fixtures/_tocheck-models/Some/RobottersDeles.php
+++ b/tests/_data/fixtures/_tocheck-models/Some/RobottersDeles.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Some;
+namespace Phalcon\Tests\Models\Some;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Statistics/AgeStats.php b/tests/_data/fixtures/_tocheck-models/Statistics/AgeStats.php
index 376dd6fb275..cd245554d8c 100644
--- a/tests/_data/fixtures/_tocheck-models/Statistics/AgeStats.php
+++ b/tests/_data/fixtures/_tocheck-models/Statistics/AgeStats.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Statistics;
+namespace Phalcon\Tests\Models\Statistics;
 
 use Phalcon\Mvc\Model;
-use Phalcon\Test\Resultsets\Stats;
+use Phalcon\Tests\Resultsets\Stats;
 
 class AgeStats extends Model
 {
diff --git a/tests/_data/fixtures/_tocheck-models/Statistics/CityStats.php b/tests/_data/fixtures/_tocheck-models/Statistics/CityStats.php
index 4d8bc201888..4439460ccdc 100644
--- a/tests/_data/fixtures/_tocheck-models/Statistics/CityStats.php
+++ b/tests/_data/fixtures/_tocheck-models/Statistics/CityStats.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Statistics;
+namespace Phalcon\Tests\Models\Statistics;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Statistics/CountryStats.php b/tests/_data/fixtures/_tocheck-models/Statistics/CountryStats.php
index 43a67b9a532..01f404764bf 100644
--- a/tests/_data/fixtures/_tocheck-models/Statistics/CountryStats.php
+++ b/tests/_data/fixtures/_tocheck-models/Statistics/CountryStats.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Statistics;
+namespace Phalcon\Tests\Models\Statistics;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Statistics/GenderStats.php b/tests/_data/fixtures/_tocheck-models/Statistics/GenderStats.php
index 8bc9405b37d..a16479c002b 100644
--- a/tests/_data/fixtures/_tocheck-models/Statistics/GenderStats.php
+++ b/tests/_data/fixtures/_tocheck-models/Statistics/GenderStats.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Statistics;
+namespace Phalcon\Tests\Models\Statistics;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Stock.php b/tests/_data/fixtures/_tocheck-models/Stock.php
index f95b644e0bc..6cb612ca60b 100644
--- a/tests/_data/fixtures/_tocheck-models/Stock.php
+++ b/tests/_data/fixtures/_tocheck-models/Stock.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Store/Parts.php b/tests/_data/fixtures/_tocheck-models/Store/Parts.php
index 1cc6860556b..09d13d1091e 100644
--- a/tests/_data/fixtures/_tocheck-models/Store/Parts.php
+++ b/tests/_data/fixtures/_tocheck-models/Store/Parts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Store;
+namespace Phalcon\Tests\Models\Store;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Store/Robots.php b/tests/_data/fixtures/_tocheck-models/Store/Robots.php
index 834b6d60744..417e7873e5d 100644
--- a/tests/_data/fixtures/_tocheck-models/Store/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Store/Robots.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Store;
+namespace Phalcon\Tests\Models\Store;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Store/RobotsParts.php b/tests/_data/fixtures/_tocheck-models/Store/RobotsParts.php
index 1c0823d3b29..3a5643f1f39 100644
--- a/tests/_data/fixtures/_tocheck-models/Store/RobotsParts.php
+++ b/tests/_data/fixtures/_tocheck-models/Store/RobotsParts.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Store;
+namespace Phalcon\Tests\Models\Store;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Subscribers.php b/tests/_data/fixtures/_tocheck-models/Subscribers.php
index 009d79665b8..9f0d0949bd5 100644
--- a/tests/_data/fixtures/_tocheck-models/Subscribers.php
+++ b/tests/_data/fixtures/_tocheck-models/Subscribers.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Subscriptores.php b/tests/_data/fixtures/_tocheck-models/Subscriptores.php
index 70a53fd090c..ae4a8d69cf2 100644
--- a/tests/_data/fixtures/_tocheck-models/Subscriptores.php
+++ b/tests/_data/fixtures/_tocheck-models/Subscriptores.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Messages\Message;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/_tocheck-models/TinyInt.php b/tests/_data/fixtures/_tocheck-models/TinyInt.php
index 47ca84ccddf..47f51135266 100644
--- a/tests/_data/fixtures/_tocheck-models/TinyInt.php
+++ b/tests/_data/fixtures/_tocheck-models/TinyInt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Users.php b/tests/_data/fixtures/_tocheck-models/Users.php
index 8d91a5168d2..d87c2d05563 100644
--- a/tests/_data/fixtures/_tocheck-models/Users.php
+++ b/tests/_data/fixtures/_tocheck-models/Users.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/_tocheck-models/Validation/Robots.php b/tests/_data/fixtures/_tocheck-models/Validation/Robots.php
index 94ba6417f73..0995c5c1006 100644
--- a/tests/_data/fixtures/_tocheck-models/Validation/Robots.php
+++ b/tests/_data/fixtures/_tocheck-models/Validation/Robots.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Validation;
+namespace Phalcon\Tests\Models\Validation;
 
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Models\RobotsParts;
+use Phalcon\Tests\Models\RobotsParts;
 use Phalcon\Validation\Validator\StringLength;
 
 /**
diff --git a/tests/_data/fixtures/_tocheck-models/Validation/Subscriptores.php b/tests/_data/fixtures/_tocheck-models/Validation/Subscriptores.php
index b84e8c9c0b2..27049cc90f7 100644
--- a/tests/_data/fixtures/_tocheck-models/Validation/Subscriptores.php
+++ b/tests/_data/fixtures/_tocheck-models/Validation/Subscriptores.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models\Validation;
+namespace Phalcon\Tests\Models\Validation;
 
 use Phalcon\Messages\Message;
 use Phalcon\Mvc\Model;
diff --git a/tests/_data/fixtures/controllers/AboutController.php b/tests/_data/fixtures/controllers/AboutController.php
index 8a300010530..9efd80f67f6 100644
--- a/tests/_data/fixtures/controllers/AboutController.php
+++ b/tests/_data/fixtures/controllers/AboutController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 class AboutController
 {
diff --git a/tests/_data/fixtures/controllers/ExceptionController.php b/tests/_data/fixtures/controllers/ExceptionController.php
index 248b36047c9..8536c583143 100644
--- a/tests/_data/fixtures/controllers/ExceptionController.php
+++ b/tests/_data/fixtures/controllers/ExceptionController.php
@@ -6,7 +6,7 @@
  * Class ExceptionController
  */
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 class ExceptionController extends \Phalcon\Mvc\Controller
 {
diff --git a/tests/_data/fixtures/controllers/InitController.php b/tests/_data/fixtures/controllers/InitController.php
index 097998d4254..4275ea2ae8b 100644
--- a/tests/_data/fixtures/controllers/InitController.php
+++ b/tests/_data/fixtures/controllers/InitController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 use Phalcon\Http\Response;
 use Phalcon\Mvc\Controller;
diff --git a/tests/_data/fixtures/controllers/MainController.php b/tests/_data/fixtures/controllers/MainController.php
index 9f7b0bb4939..3cf40ffe29d 100644
--- a/tests/_data/fixtures/controllers/MainController.php
+++ b/tests/_data/fixtures/controllers/MainController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 /**
  * Class MainController
diff --git a/tests/_data/fixtures/controllers/Micro/Collections/PersonasController.php b/tests/_data/fixtures/controllers/Micro/Collections/PersonasController.php
index 27829cc22e3..2880759a74e 100644
--- a/tests/_data/fixtures/controllers/Micro/Collections/PersonasController.php
+++ b/tests/_data/fixtures/controllers/Micro/Collections/PersonasController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers\Micro\Collections;
+namespace Phalcon\Tests\Controllers\Micro\Collections;
 
 class PersonasController
 {
diff --git a/tests/_data/fixtures/controllers/Micro/Collections/PersonasLazyController.php b/tests/_data/fixtures/controllers/Micro/Collections/PersonasLazyController.php
index efe75f419b0..f72fe219afa 100644
--- a/tests/_data/fixtures/controllers/Micro/Collections/PersonasLazyController.php
+++ b/tests/_data/fixtures/controllers/Micro/Collections/PersonasLazyController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers\Micro\Collections;
+namespace Phalcon\Tests\Controllers\Micro\Collections;
 
 class PersonasLazyController
 {
diff --git a/tests/_data/fixtures/controllers/MicroController.php b/tests/_data/fixtures/controllers/MicroController.php
index 07aff88af4e..eefb9f18209 100644
--- a/tests/_data/fixtures/controllers/MicroController.php
+++ b/tests/_data/fixtures/controllers/MicroController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 use Phalcon\Http\Response;
 use Phalcon\Mvc\Controller;
diff --git a/tests/_data/fixtures/controllers/ProductsController.php b/tests/_data/fixtures/controllers/ProductsController.php
index a4286b25153..e51d450816a 100644
--- a/tests/_data/fixtures/controllers/ProductsController.php
+++ b/tests/_data/fixtures/controllers/ProductsController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 /**
  * Class ProductsController
diff --git a/tests/_data/fixtures/controllers/RobotsController.php b/tests/_data/fixtures/controllers/RobotsController.php
index 8c79857fe3f..b96a6c18d4d 100644
--- a/tests/_data/fixtures/controllers/RobotsController.php
+++ b/tests/_data/fixtures/controllers/RobotsController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 /**
  * @RoutePrefix("/robots")
diff --git a/tests/_data/fixtures/controllers/ViewRequestController.php b/tests/_data/fixtures/controllers/ViewRequestController.php
index d725cb36ae6..06ae8260cf1 100644
--- a/tests/_data/fixtures/controllers/ViewRequestController.php
+++ b/tests/_data/fixtures/controllers/ViewRequestController.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Controllers;
+namespace Phalcon\Tests\Controllers;
 
 use Phalcon\Mvc\Controller;
 
diff --git a/tests/_data/fixtures/models/Customers.php b/tests/_data/fixtures/models/Customers.php
index 1ee7d58ed19..5895eed4f34 100644
--- a/tests/_data/fixtures/models/Customers.php
+++ b/tests/_data/fixtures/models/Customers.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/CustomersDefaults.php b/tests/_data/fixtures/models/CustomersDefaults.php
index 91b9f6ac321..530c0abafe8 100644
--- a/tests/_data/fixtures/models/CustomersDefaults.php
+++ b/tests/_data/fixtures/models/CustomersDefaults.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/CustomersKeepSnapshots.php b/tests/_data/fixtures/models/CustomersKeepSnapshots.php
index b831902d329..dee67417456 100644
--- a/tests/_data/fixtures/models/CustomersKeepSnapshots.php
+++ b/tests/_data/fixtures/models/CustomersKeepSnapshots.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/FractalDates.php b/tests/_data/fixtures/models/FractalDates.php
index 2d8f9660f20..7da3fb6d2bc 100644
--- a/tests/_data/fixtures/models/FractalDates.php
+++ b/tests/_data/fixtures/models/FractalDates.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Invoices.php b/tests/_data/fixtures/models/Invoices.php
index 3196e2e25da..04eea939899 100644
--- a/tests/_data/fixtures/models/Invoices.php
+++ b/tests/_data/fixtures/models/Invoices.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/InvoicesBehavior.php b/tests/_data/fixtures/models/InvoicesBehavior.php
index 96480aebf01..64012ef92ab 100644
--- a/tests/_data/fixtures/models/InvoicesBehavior.php
+++ b/tests/_data/fixtures/models/InvoicesBehavior.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
 use Phalcon\Mvc\Model\Behavior\Timestampable;
diff --git a/tests/_data/fixtures/models/InvoicesExtended.php b/tests/_data/fixtures/models/InvoicesExtended.php
index a5ce8213b29..71443154b3e 100644
--- a/tests/_data/fixtures/models/InvoicesExtended.php
+++ b/tests/_data/fixtures/models/InvoicesExtended.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\ModelInterface;
 
diff --git a/tests/_data/fixtures/models/InvoicesKeepSnapshots.php b/tests/_data/fixtures/models/InvoicesKeepSnapshots.php
index b559ccee6be..48d8c785e0f 100644
--- a/tests/_data/fixtures/models/InvoicesKeepSnapshots.php
+++ b/tests/_data/fixtures/models/InvoicesKeepSnapshots.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 /**
  * Class InvoicesMap
diff --git a/tests/_data/fixtures/models/InvoicesMap.php b/tests/_data/fixtures/models/InvoicesMap.php
index 733396a01ec..9375eaa2998 100644
--- a/tests/_data/fixtures/models/InvoicesMap.php
+++ b/tests/_data/fixtures/models/InvoicesMap.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/InvoicesSchema.php b/tests/_data/fixtures/models/InvoicesSchema.php
index 0fcfafc0500..fee19208c76 100644
--- a/tests/_data/fixtures/models/InvoicesSchema.php
+++ b/tests/_data/fixtures/models/InvoicesSchema.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/InvoicesValidationFails.php b/tests/_data/fixtures/models/InvoicesValidationFails.php
index 1baaa380493..28b588cc849 100644
--- a/tests/_data/fixtures/models/InvoicesValidationFails.php
+++ b/tests/_data/fixtures/models/InvoicesValidationFails.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 /**
  * Class InvoicesValidationFails
  *
- * @package Phalcon\Test\Models
+ * @package Phalcon\Tests\Models
  */
 class InvoicesValidationFails extends Invoices
 {
diff --git a/tests/_data/fixtures/models/ModelWithStringPrimary.php b/tests/_data/fixtures/models/ModelWithStringPrimary.php
index eecee0ca42a..da2cbb04945 100644
--- a/tests/_data/fixtures/models/ModelWithStringPrimary.php
+++ b/tests/_data/fixtures/models/ModelWithStringPrimary.php
@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Objects.php b/tests/_data/fixtures/models/Objects.php
index 9ba5051122b..40df98174b3 100644
--- a/tests/_data/fixtures/models/Objects.php
+++ b/tests/_data/fixtures/models/Objects.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/ObjectsWithColumnMap.php b/tests/_data/fixtures/models/ObjectsWithColumnMap.php
index 4f339c4e3e9..4020a98df70 100644
--- a/tests/_data/fixtures/models/ObjectsWithColumnMap.php
+++ b/tests/_data/fixtures/models/ObjectsWithColumnMap.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Orders.php b/tests/_data/fixtures/models/Orders.php
index 60de513ee3a..565236593cd 100644
--- a/tests/_data/fixtures/models/Orders.php
+++ b/tests/_data/fixtures/models/Orders.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/OrdersProducts.php b/tests/_data/fixtures/models/OrdersProducts.php
index bf8b3379aac..6dacddf71f8 100644
--- a/tests/_data/fixtures/models/OrdersProducts.php
+++ b/tests/_data/fixtures/models/OrdersProducts.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Products.php b/tests/_data/fixtures/models/Products.php
index 9da072cbf2f..25531c1f0b1 100644
--- a/tests/_data/fixtures/models/Products.php
+++ b/tests/_data/fixtures/models/Products.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Setters.php b/tests/_data/fixtures/models/Setters.php
index 5246d8c29fd..a156fd96f74 100644
--- a/tests/_data/fixtures/models/Setters.php
+++ b/tests/_data/fixtures/models/Setters.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Sources.php b/tests/_data/fixtures/models/Sources.php
index 8c0df2ebb17..86167532580 100644
--- a/tests/_data/fixtures/models/Sources.php
+++ b/tests/_data/fixtures/models/Sources.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/models/Stuff.php b/tests/_data/fixtures/models/Stuff.php
index 11aff066ebc..22c4d22433c 100644
--- a/tests/_data/fixtures/models/Stuff.php
+++ b/tests/_data/fixtures/models/Stuff.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Models;
+namespace Phalcon\Tests\Models;
 
 use Phalcon\Mvc\Model;
 
diff --git a/tests/_data/fixtures/modules/backend/Module.php b/tests/_data/fixtures/modules/backend/Module.php
index ef9c6073a53..1ab47c03da3 100644
--- a/tests/_data/fixtures/modules/backend/Module.php
+++ b/tests/_data/fixtures/modules/backend/Module.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Modules\Backend;
+namespace Phalcon\Tests\Modules\Backend;
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Loader;
@@ -9,7 +9,7 @@
 use function dataDir;
 
 /**
- * \Phalcon\Test\Modules\Backend\Module
+ * \Phalcon\Tests\Modules\Backend\Module
  * Backend Module
  *
  * @copyright (c) 2011-2017 Phalcon Team
@@ -50,7 +50,7 @@ function () {
          */
         $loader = new Loader();
         $loader->registerNamespaces([
-                'Phalcon\Test\Modules\Backend\Tasks' =>
+                'Phalcon\Tests\Modules\Backend\Tasks' =>
                     dataDir('fixtures/modules/backend/tasks/')
             ]
         );
diff --git a/tests/_data/fixtures/modules/backend/controllers/LoginController.php b/tests/_data/fixtures/modules/backend/controllers/LoginController.php
index 36b9a9065ec..66308e86ac5 100644
--- a/tests/_data/fixtures/modules/backend/controllers/LoginController.php
+++ b/tests/_data/fixtures/modules/backend/controllers/LoginController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Modules\Backend\Controllers;
+namespace Phalcon\Tests\Modules\Backend\Controllers;
 
 use Phalcon\Mvc\Controller;
 
diff --git a/tests/_data/fixtures/modules/backend/tasks/MainTask.php b/tests/_data/fixtures/modules/backend/tasks/MainTask.php
index cc75a6564fa..1a87724f84a 100644
--- a/tests/_data/fixtures/modules/backend/tasks/MainTask.php
+++ b/tests/_data/fixtures/modules/backend/tasks/MainTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Modules\Backend\Tasks;
+namespace Phalcon\Tests\Modules\Backend\Tasks;
 
 class MainTask extends \Phalcon\CLI\Task
 {
diff --git a/tests/_data/fixtures/modules/frontend/Module.php b/tests/_data/fixtures/modules/frontend/Module.php
index e4f9c43c219..cc076efc4e2 100644
--- a/tests/_data/fixtures/modules/frontend/Module.php
+++ b/tests/_data/fixtures/modules/frontend/Module.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Modules\Frontend;
+namespace Phalcon\Tests\Modules\Frontend;
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\ModuleDefinitionInterface;
@@ -9,7 +9,7 @@
 use function dataDir;
 
 /**
- * \Phalcon\Test\Modules\Frontend\Module
+ * \Phalcon\Tests\Modules\Frontend\Module
  * Frontend Module
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/_data/fixtures/modules/frontend/controllers/IndexController.php b/tests/_data/fixtures/modules/frontend/controllers/IndexController.php
index 26bb393539c..633220fc8ff 100644
--- a/tests/_data/fixtures/modules/frontend/controllers/IndexController.php
+++ b/tests/_data/fixtures/modules/frontend/controllers/IndexController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Modules\Frontend\Controllers;
+namespace Phalcon\Tests\Modules\Frontend\Controllers;
 
 use Phalcon\Mvc\Controller;
 
diff --git a/tests/_data/fixtures/resultsets/Stats.php b/tests/_data/fixtures/resultsets/Stats.php
index 25e868ce6fd..7ddafd27665 100644
--- a/tests/_data/fixtures/resultsets/Stats.php
+++ b/tests/_data/fixtures/resultsets/Stats.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Resultsets;
+namespace Phalcon\Tests\Resultsets;
 
 use Phalcon\Mvc\Model\Resultset\Simple;
 
diff --git a/tests/_support/Helper/_PhalconCacheFile.php b/tests/_support/Helper/_PhalconCacheFile.php
index 0bff67ee21a..c1e8929a078 100644
--- a/tests/_support/Helper/_PhalconCacheFile.php
+++ b/tests/_support/Helper/_PhalconCacheFile.php
@@ -13,7 +13,7 @@
 use Phalcon\Cache\FrontendInterface;
 
 /**
- * Phalcon\Test\Module\Cache\Backend\File
+ * Phalcon\Tests\Module\Cache\Backend\File
  *
  * Module for testing backend cache adapters
  *
diff --git a/tests/cli/Cli/Console/ConstructCest.php b/tests/cli/Cli/Console/ConstructCest.php
index 044aa1d39b1..892cc1312b7 100644
--- a/tests/cli/Cli/Console/ConstructCest.php
+++ b/tests/cli/Cli/Console/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
diff --git a/tests/cli/Cli/Console/GetModuleCest.php b/tests/cli/Cli/Console/GetModuleCest.php
index 54283112e22..87c03df0617 100644
--- a/tests/cli/Cli/Console/GetModuleCest.php
+++ b/tests/cli/Cli/Console/GetModuleCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Application\Exception;
 use Phalcon\Cli\Console as CliConsole;
 use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
-use Phalcon\Test\Modules\Backend\Module as BackendModule;
-use Phalcon\Test\Modules\Frontend\Module as FrontendModule;
+use Phalcon\Tests\Modules\Backend\Module as BackendModule;
+use Phalcon\Tests\Modules\Frontend\Module as FrontendModule;
 
 class GetModuleCest
 {
diff --git a/tests/cli/Cli/Console/GetModulesCest.php b/tests/cli/Cli/Console/GetModulesCest.php
index 1989bfc7159..8b08bcc9706 100644
--- a/tests/cli/Cli/Console/GetModulesCest.php
+++ b/tests/cli/Cli/Console/GetModulesCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
 use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Modules\Backend\Module as BackendModule;
-use Phalcon\Test\Modules\Frontend\Module as FrontendModule;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Modules\Backend\Module as BackendModule;
+use Phalcon\Tests\Modules\Frontend\Module as FrontendModule;
 
 class GetModulesCest
 {
diff --git a/tests/cli/Cli/Console/GetSetDICest.php b/tests/cli/Cli/Console/GetSetDICest.php
index 4c778bd0bab..c1bcb8f59f4 100644
--- a/tests/cli/Cli/Console/GetSetDICest.php
+++ b/tests/cli/Cli/Console/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
diff --git a/tests/cli/Cli/Console/GetSetDefaultModuleCest.php b/tests/cli/Cli/Console/GetSetDefaultModuleCest.php
index ccc4c669c17..78f2dae8a84 100644
--- a/tests/cli/Cli/Console/GetSetDefaultModuleCest.php
+++ b/tests/cli/Cli/Console/GetSetDefaultModuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
diff --git a/tests/cli/Cli/Console/GetSetEventsManagerCest.php b/tests/cli/Cli/Console/GetSetEventsManagerCest.php
index 0a9a4f3f291..4dd83946941 100644
--- a/tests/cli/Cli/Console/GetSetEventsManagerCest.php
+++ b/tests/cli/Cli/Console/GetSetEventsManagerCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
diff --git a/tests/cli/Cli/Console/HandleCest.php b/tests/cli/Cli/Console/HandleCest.php
index 31783711dd1..10771a18091 100644
--- a/tests/cli/Cli/Console/HandleCest.php
+++ b/tests/cli/Cli/Console/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Exception;
@@ -20,9 +20,9 @@
 use Phalcon\Cli\Dispatcher\Exception as DispatcherException;
 use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
 use Phalcon\Events\Event;
-use Phalcon\Test\Fixtures\Tasks\Issue787Task;
-use Phalcon\Test\Modules\Backend\Module as BackendModule;
-use Phalcon\Test\Modules\Frontend\Module as FrontendModule;
+use Phalcon\Tests\Fixtures\Tasks\Issue787Task;
+use Phalcon\Tests\Modules\Backend\Module as BackendModule;
+use Phalcon\Tests\Modules\Frontend\Module as FrontendModule;
 
 class HandleCest
 {
@@ -48,7 +48,7 @@ function () {
         $console = new CliConsole($container);
 
         $dispatcher = $console->getDI()->getShared('dispatcher');
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
 
         $console->handle([]);
 
@@ -181,7 +181,7 @@ public function handleModule(CliTester $I)
         );
 
         $dispatcher = $console->dispatcher;
-        $dispatcher->setNamespaceName('Phalcon\Test\Modules\Backend\Tasks');
+        $dispatcher->setNamespaceName('Phalcon\Tests\Modules\Backend\Tasks');
 
         $I->expectThrowable(
             new Exception('Task Run'),
@@ -276,7 +276,7 @@ function (Event $event, $console, $moduleName) {
             ]
         );
 
-        $console->dispatcher->setNamespaceName('Phalcon\Test\Modules\Backend\Tasks');
+        $console->dispatcher->setNamespaceName('Phalcon\Tests\Modules\Backend\Tasks');
 
         $I->expectThrowable(
             new Exception('Console Before Start BackendModule Event Fired'),
@@ -317,7 +317,7 @@ public function handleEventAfterStartModule(CliTester $I)
             ]
         );
 
-        $console->dispatcher->setNamespaceName('Phalcon\Test\Modules\Backend\Tasks');
+        $console->dispatcher->setNamespaceName('Phalcon\Tests\Modules\Backend\Tasks');
 
         $eventsManager->attach(
             'console:afterStartModule',
@@ -401,7 +401,7 @@ function (Event $event, $console, $moduleObject) {
                 ],
             ]
         );
-        $console->dispatcher->setNamespaceName('Phalcon\Test\Modules\Backend\Tasks');
+        $console->dispatcher->setNamespaceName('Phalcon\Tests\Modules\Backend\Tasks');
 
         $I->expectThrowable(
             new Exception(
@@ -432,7 +432,7 @@ public function handle13724(CliTester $I)
         $console = new CliConsole(new DiFactoryDefault());
 
         $dispatcher = $console->dispatcher;
-        $dispatcher->setNamespaceName('Phalcon\Test\Modules\Backend\Tasks');
+        $dispatcher->setNamespaceName('Phalcon\Tests\Modules\Backend\Tasks');
 
         $console->registerModules(
             [
@@ -454,7 +454,7 @@ public function handle13724(CliTester $I)
         $console = new CliConsole(new DiFactoryDefault());
 
         $dispatcher = $console->dispatcher;
-        $dispatcher->setNamespaceName('Phalcon\Test\Modules\Backend\Tasks');
+        $dispatcher->setNamespaceName('Phalcon\Tests\Modules\Backend\Tasks');
 
         $console->registerModules(
             [
@@ -527,7 +527,7 @@ function () use ($console) {
     public function testIssue787(CliTester $I)
     {
         $console = new CliConsole(new DiFactoryDefault());
-        $console->dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $console->dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
 
         $console->handle(
             [
diff --git a/tests/cli/Cli/Console/RegisterModulesCest.php b/tests/cli/Cli/Console/RegisterModulesCest.php
index 9dc41095f07..2820a508bad 100644
--- a/tests/cli/Cli/Console/RegisterModulesCest.php
+++ b/tests/cli/Cli/Console/RegisterModulesCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
 use Phalcon\Cli\Console\Exception;
 use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
-use Phalcon\Test\Modules\Frontend\Module as FrontendModule;
+use Phalcon\Tests\Modules\Frontend\Module as FrontendModule;
 
 class RegisterModulesCest
 {
diff --git a/tests/cli/Cli/Console/SetArgumentCest.php b/tests/cli/Cli/Console/SetArgumentCest.php
index 580bc08da6d..ae2b2af15b9 100644
--- a/tests/cli/Cli/Console/SetArgumentCest.php
+++ b/tests/cli/Cli/Console/SetArgumentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
@@ -46,7 +46,7 @@ function () {
         );
 
         $dispatcher = $di->getShared('dispatcher');
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $console->setArgument([
             'php',
             '--foo=bar',
@@ -89,7 +89,7 @@ public function testArgumentArray(CliTester $I)
 
 
         $dispatcher = $di->getShared('dispatcher');
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
 
         $console->setArgument(
             [
@@ -217,7 +217,7 @@ public function testArgumentNoShift(CliTester $I)
         $console = new CliConsole($di);
 
         $dispatcher = $di->getShared('dispatcher');
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
 
         $console->setArgument(
             [],
@@ -349,7 +349,7 @@ function () {
         );
 
         $dispatcher = $di->getShared('dispatcher');
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
 
 
         $console->setArgument(
diff --git a/tests/cli/Cli/Console/UnderscoreGetCest.php b/tests/cli/Cli/Console/UnderscoreGetCest.php
index f70dc074976..f2aa42d52ed 100644
--- a/tests/cli/Cli/Console/UnderscoreGetCest.php
+++ b/tests/cli/Cli/Console/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Console;
+namespace Phalcon\Tests\Cli\Cli\Console;
 
 use CliTester;
 use Phalcon\Cli\Console as CliConsole;
diff --git a/tests/cli/Cli/Dispatcher/CallActionMethodCest.php b/tests/cli/Cli/Dispatcher/CallActionMethodCest.php
index d2193e52d8b..2eb5d7f6a1f 100644
--- a/tests/cli/Cli/Dispatcher/CallActionMethodCest.php
+++ b/tests/cli/Cli/Dispatcher/CallActionMethodCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
-use Phalcon\Test\Fixtures\Tasks\MainTask;
+use Phalcon\Tests\Fixtures\Tasks\MainTask;
 
 class CallActionMethodCest
 {
diff --git a/tests/cli/Cli/Dispatcher/DispatchCest.php b/tests/cli/Cli/Dispatcher/DispatchCest.php
index ad0ece589b4..40b92e0a503 100644
--- a/tests/cli/Cli/Dispatcher/DispatchCest.php
+++ b/tests/cli/Cli/Dispatcher/DispatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -35,7 +35,7 @@ public function cliDispatcherDispatch(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->dispatch();
         $I->assertEquals(
             'main',
@@ -60,7 +60,7 @@ public function cliDispatcherDispatch(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setTaskName('echo');
         $dispatcher->dispatch();
         $I->assertEquals(
@@ -85,7 +85,7 @@ public function cliDispatcherDispatch(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setTaskName('main');
         $dispatcher->setActionName('hello');
         $dispatcher->dispatch();
@@ -111,7 +111,7 @@ public function cliDispatcherDispatch(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setActionName('hello');
         $dispatcher->setParams(
             [
@@ -145,7 +145,7 @@ public function cliDispatcherDispatch(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setActionName('hello');
         $dispatcher->setParams(
             [
diff --git a/tests/cli/Cli/Dispatcher/ForwardCest.php b/tests/cli/Cli/Dispatcher/ForwardCest.php
index da0c9ccf383..decb2527fbb 100644
--- a/tests/cli/Cli/Dispatcher/ForwardCest.php
+++ b/tests/cli/Cli/Dispatcher/ForwardCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -32,7 +32,7 @@ public function cliDispatcherForward(CliTester $I)
         $I->wantToTest('Cli\Dispatcher - forward()');
 
         $dispatcher = new Dispatcher();
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setActionName('hello');
         $dispatcher->forward(
             [
diff --git a/tests/cli/Cli/Dispatcher/GetActiveMethodCest.php b/tests/cli/Cli/Dispatcher/GetActiveMethodCest.php
index 3eecc76ea65..6c1e083dd9f 100644
--- a/tests/cli/Cli/Dispatcher/GetActiveMethodCest.php
+++ b/tests/cli/Cli/Dispatcher/GetActiveMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetActiveTaskCest.php b/tests/cli/Cli/Dispatcher/GetActiveTaskCest.php
index 2de825dd332..95d3dae0597 100644
--- a/tests/cli/Cli/Dispatcher/GetActiveTaskCest.php
+++ b/tests/cli/Cli/Dispatcher/GetActiveTaskCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -35,10 +35,10 @@ public function cliDispatcherGetActiveTask(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setTaskName("main");
         $dispatcher->dispatch();
 
-        $I->assertInstanceOf('\Phalcon\Test\Fixtures\Tasks\MainTask', $dispatcher->getActiveTask());
+        $I->assertInstanceOf('\Phalcon\Tests\Fixtures\Tasks\MainTask', $dispatcher->getActiveTask());
     }
 }
diff --git a/tests/cli/Cli/Dispatcher/GetBoundModelsCest.php b/tests/cli/Cli/Dispatcher/GetBoundModelsCest.php
index db79e5fa305..f3b989c893a 100644
--- a/tests/cli/Cli/Dispatcher/GetBoundModelsCest.php
+++ b/tests/cli/Cli/Dispatcher/GetBoundModelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetHandlerClassCest.php b/tests/cli/Cli/Dispatcher/GetHandlerClassCest.php
index a61d533cb1d..5bde10980be 100644
--- a/tests/cli/Cli/Dispatcher/GetHandlerClassCest.php
+++ b/tests/cli/Cli/Dispatcher/GetHandlerClassCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Codeception\Example;
diff --git a/tests/cli/Cli/Dispatcher/GetLastTaskCest.php b/tests/cli/Cli/Dispatcher/GetLastTaskCest.php
index 6786f15e7d4..9a65a09466f 100644
--- a/tests/cli/Cli/Dispatcher/GetLastTaskCest.php
+++ b/tests/cli/Cli/Dispatcher/GetLastTaskCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -32,15 +32,15 @@ public function cliDispatcherGetLastTask(CliTester $I)
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setTaskName("main");
         $dispatcher->dispatch();
 
-        $I->assertInstanceOf('\Phalcon\Test\Fixtures\Tasks\MainTask', $dispatcher->getLastTask());
+        $I->assertInstanceOf('\Phalcon\Tests\Fixtures\Tasks\MainTask', $dispatcher->getLastTask());
 
         $dispatcher->setTaskName("echo");
         $dispatcher->dispatch();
 
-        $I->assertInstanceOf('\Phalcon\Test\Fixtures\Tasks\EchoTask', $dispatcher->getLastTask());
+        $I->assertInstanceOf('\Phalcon\Tests\Fixtures\Tasks\EchoTask', $dispatcher->getLastTask());
     }
 }
diff --git a/tests/cli/Cli/Dispatcher/GetOptionCest.php b/tests/cli/Cli/Dispatcher/GetOptionCest.php
index 02796f85db8..8a4084b7d9b 100644
--- a/tests/cli/Cli/Dispatcher/GetOptionCest.php
+++ b/tests/cli/Cli/Dispatcher/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetParamCest.php b/tests/cli/Cli/Dispatcher/GetParamCest.php
index 13f4cc5b32a..021075869eb 100644
--- a/tests/cli/Cli/Dispatcher/GetParamCest.php
+++ b/tests/cli/Cli/Dispatcher/GetParamCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetParamCest
 {
@@ -39,7 +39,7 @@ public function testCliParameters(CliTester $I)
         );
 
         // Test $this->dispatcher->getParam()
-        $dispatcher->setNamespaceName('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setNamespaceName('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setTaskName('params');
         $dispatcher->setActionName('param');
 
diff --git a/tests/cli/Cli/Dispatcher/GetParamsCest.php b/tests/cli/Cli/Dispatcher/GetParamsCest.php
index 1261642c41f..27d7837cfbd 100644
--- a/tests/cli/Cli/Dispatcher/GetParamsCest.php
+++ b/tests/cli/Cli/Dispatcher/GetParamsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetParamsCest
 {
@@ -37,7 +37,7 @@ public function testCliParameters(CliTester $I)
         );
 
         // Test $this->dispatcher->getParams()
-        $dispatcher->setNamespaceName('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setNamespaceName('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setTaskName('params');
         $dispatcher->setActionName('params');
 
diff --git a/tests/cli/Cli/Dispatcher/GetSetActionNameCest.php b/tests/cli/Cli/Dispatcher/GetSetActionNameCest.php
index 763dba0de72..5bafcd21e6c 100644
--- a/tests/cli/Cli/Dispatcher/GetSetActionNameCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetActionSuffixCest.php b/tests/cli/Cli/Dispatcher/GetSetActionSuffixCest.php
index fe878fc32c9..c0c25f13bab 100644
--- a/tests/cli/Cli/Dispatcher/GetSetActionSuffixCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetActionSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetDICest.php b/tests/cli/Cli/Dispatcher/GetSetDICest.php
index 3f1f26ecc94..2856bb44d37 100644
--- a/tests/cli/Cli/Dispatcher/GetSetDICest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetDICest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetDICest
 {
diff --git a/tests/cli/Cli/Dispatcher/GetSetDefaultNamespaceCest.php b/tests/cli/Cli/Dispatcher/GetSetDefaultNamespaceCest.php
index 37f2a2ebbad..343446df093 100644
--- a/tests/cli/Cli/Dispatcher/GetSetDefaultNamespaceCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetEventsManagerCest.php b/tests/cli/Cli/Dispatcher/GetSetEventsManagerCest.php
index c56cb22afae..420c629568b 100644
--- a/tests/cli/Cli/Dispatcher/GetSetEventsManagerCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetEventsManagerCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetEventsManagerCest
 {
diff --git a/tests/cli/Cli/Dispatcher/GetSetHandlerSuffixCest.php b/tests/cli/Cli/Dispatcher/GetSetHandlerSuffixCest.php
index 7e66cffbd20..e359c85bd4a 100644
--- a/tests/cli/Cli/Dispatcher/GetSetHandlerSuffixCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetHandlerSuffixCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
 use Phalcon\Cli\Dispatcher\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetHandlerSuffixCest
 {
diff --git a/tests/cli/Cli/Dispatcher/GetSetModelBinderCest.php b/tests/cli/Cli/Dispatcher/GetSetModelBinderCest.php
index 6cc9ce93c8f..2e5a2d541c6 100644
--- a/tests/cli/Cli/Dispatcher/GetSetModelBinderCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetModuleNameCest.php b/tests/cli/Cli/Dispatcher/GetSetModuleNameCest.php
index 9c7e6d104c2..8455e147d35 100644
--- a/tests/cli/Cli/Dispatcher/GetSetModuleNameCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetNamespaceNameCest.php b/tests/cli/Cli/Dispatcher/GetSetNamespaceNameCest.php
index 66ea49413dc..a6e2ccc749f 100644
--- a/tests/cli/Cli/Dispatcher/GetSetNamespaceNameCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetOptionsCest.php b/tests/cli/Cli/Dispatcher/GetSetOptionsCest.php
index 33eedcdd55c..76438133c35 100644
--- a/tests/cli/Cli/Dispatcher/GetSetOptionsCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetReturnedValueCest.php b/tests/cli/Cli/Dispatcher/GetSetReturnedValueCest.php
index 14b7001dd82..5a3bc167e18 100644
--- a/tests/cli/Cli/Dispatcher/GetSetReturnedValueCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetReturnedValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php b/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php
index 56925a3c2d9..9f0b8af8401 100644
--- a/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php b/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php
index ffa811c3cb5..659a79201a5 100644
--- a/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php
+++ b/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/HasOptionCest.php b/tests/cli/Cli/Dispatcher/HasOptionCest.php
index 12a00dfd584..f01ae8c4ffb 100644
--- a/tests/cli/Cli/Dispatcher/HasOptionCest.php
+++ b/tests/cli/Cli/Dispatcher/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/HasParamCest.php b/tests/cli/Cli/Dispatcher/HasParamCest.php
index d3a8db849e0..b1c50e4a1d6 100644
--- a/tests/cli/Cli/Dispatcher/HasParamCest.php
+++ b/tests/cli/Cli/Dispatcher/HasParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/IsFinishedCest.php b/tests/cli/Cli/Dispatcher/IsFinishedCest.php
index 720c6a3e3f5..21b84027ac5 100644
--- a/tests/cli/Cli/Dispatcher/IsFinishedCest.php
+++ b/tests/cli/Cli/Dispatcher/IsFinishedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -33,7 +33,7 @@ public function cliDispatcherIsFinished(CliTester $I)
         $I->wantToTest('Cli\Dispatcher - isFinished()');
 
         $dispatcher = new Dispatcher();
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
diff --git a/tests/cli/Cli/Dispatcher/SetDefaultActionCest.php b/tests/cli/Cli/Dispatcher/SetDefaultActionCest.php
index dc70cedf844..2ab9893dcd9 100644
--- a/tests/cli/Cli/Dispatcher/SetDefaultActionCest.php
+++ b/tests/cli/Cli/Dispatcher/SetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -30,7 +30,7 @@ public function cliDispatcherSetDefaultAction(CliTester $I)
         $I->wantToTest('Cli\Dispatcher - setDefaultAction()');
 
         $dispatcher = new Dispatcher();
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
diff --git a/tests/cli/Cli/Dispatcher/SetDefaultTaskCest.php b/tests/cli/Cli/Dispatcher/SetDefaultTaskCest.php
index 0b36d73f3d6..6660de72622 100644
--- a/tests/cli/Cli/Dispatcher/SetDefaultTaskCest.php
+++ b/tests/cli/Cli/Dispatcher/SetDefaultTaskCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -30,7 +30,7 @@ public function cliDispatcherSetDefaultTask(CliTester $I)
         $I->wantToTest('Cli\Dispatcher - setDefaultTask()');
 
         $dispatcher = new Dispatcher();
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
diff --git a/tests/cli/Cli/Dispatcher/SetParamCest.php b/tests/cli/Cli/Dispatcher/SetParamCest.php
index 9f1816e4cbe..c428448fd34 100644
--- a/tests/cli/Cli/Dispatcher/SetParamCest.php
+++ b/tests/cli/Cli/Dispatcher/SetParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/SetParamsCest.php b/tests/cli/Cli/Dispatcher/SetParamsCest.php
index 6545cfebb5a..0503efae945 100644
--- a/tests/cli/Cli/Dispatcher/SetParamsCest.php
+++ b/tests/cli/Cli/Dispatcher/SetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
diff --git a/tests/cli/Cli/Dispatcher/WasForwardedCest.php b/tests/cli/Cli/Dispatcher/WasForwardedCest.php
index 57da61cf315..ef4b399d92c 100644
--- a/tests/cli/Cli/Dispatcher/WasForwardedCest.php
+++ b/tests/cli/Cli/Dispatcher/WasForwardedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Dispatcher;
+namespace Phalcon\Tests\Cli\Cli\Dispatcher;
 
 use CliTester;
 use Phalcon\Cli\Dispatcher;
@@ -30,7 +30,7 @@ public function cliDispatcherWasForwarded(CliTester $I)
         $I->wantToTest('Cli\Dispatcher - wasForwarded()');
 
         $dispatcher = new Dispatcher();
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
+        $dispatcher->setDefaultNamespace('Phalcon\Tests\Fixtures\Tasks');
         $dispatcher->setDI(
             new DiFactoryDefault()
         );
diff --git a/tests/cli/Cli/Router/AddCest.php b/tests/cli/Cli/Router/AddCest.php
index 745c14f02e1..eb60385f0fa 100644
--- a/tests/cli/Cli/Router/AddCest.php
+++ b/tests/cli/Cli/Router/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/ConstructCest.php b/tests/cli/Cli/Router/ConstructCest.php
index 9bb8b979f82..fcbdf7d334c 100644
--- a/tests/cli/Cli/Router/ConstructCest.php
+++ b/tests/cli/Cli/Router/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetActionNameCest.php b/tests/cli/Cli/Router/GetActionNameCest.php
index bce4f7370ab..7c3beda576e 100644
--- a/tests/cli/Cli/Router/GetActionNameCest.php
+++ b/tests/cli/Cli/Router/GetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetMatchedRouteCest.php b/tests/cli/Cli/Router/GetMatchedRouteCest.php
index 507bb96c9a6..b25e720d68d 100644
--- a/tests/cli/Cli/Router/GetMatchedRouteCest.php
+++ b/tests/cli/Cli/Router/GetMatchedRouteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetMatchesCest.php b/tests/cli/Cli/Router/GetMatchesCest.php
index 14c2974a545..ab67e16090a 100644
--- a/tests/cli/Cli/Router/GetMatchesCest.php
+++ b/tests/cli/Cli/Router/GetMatchesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetModuleNameCest.php b/tests/cli/Cli/Router/GetModuleNameCest.php
index cc3d77f7f23..547d820c641 100644
--- a/tests/cli/Cli/Router/GetModuleNameCest.php
+++ b/tests/cli/Cli/Router/GetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetParamsCest.php b/tests/cli/Cli/Router/GetParamsCest.php
index 70f5442718e..a8a73a21df4 100644
--- a/tests/cli/Cli/Router/GetParamsCest.php
+++ b/tests/cli/Cli/Router/GetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetRouteByIdCest.php b/tests/cli/Cli/Router/GetRouteByIdCest.php
index 67b196bf6ac..685d5cc2a6c 100644
--- a/tests/cli/Cli/Router/GetRouteByIdCest.php
+++ b/tests/cli/Cli/Router/GetRouteByIdCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
 use Phalcon\Cli\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetRouteByIdCest
 {
diff --git a/tests/cli/Cli/Router/GetRouteByNameCest.php b/tests/cli/Cli/Router/GetRouteByNameCest.php
index 52982945589..6121acc231d 100644
--- a/tests/cli/Cli/Router/GetRouteByNameCest.php
+++ b/tests/cli/Cli/Router/GetRouteByNameCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
 use Phalcon\Cli\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetRouteByNameCest
 {
diff --git a/tests/cli/Cli/Router/GetRoutesCest.php b/tests/cli/Cli/Router/GetRoutesCest.php
index b5c0a513cb3..2b82105fe04 100644
--- a/tests/cli/Cli/Router/GetRoutesCest.php
+++ b/tests/cli/Cli/Router/GetRoutesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetRoutesCest
 {
diff --git a/tests/cli/Cli/Router/GetSetDICest.php b/tests/cli/Cli/Router/GetSetDICest.php
index bd6a4607b6e..f40fef88f58 100644
--- a/tests/cli/Cli/Router/GetSetDICest.php
+++ b/tests/cli/Cli/Router/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/GetTaskNameCest.php b/tests/cli/Cli/Router/GetTaskNameCest.php
index 7877f0e3aa9..6fc2311d4ed 100644
--- a/tests/cli/Cli/Router/GetTaskNameCest.php
+++ b/tests/cli/Cli/Router/GetTaskNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/HandleCest.php b/tests/cli/Cli/Router/HandleCest.php
index 1594a29b23d..ae2a375f8db 100644
--- a/tests/cli/Cli/Router/HandleCest.php
+++ b/tests/cli/Cli/Router/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Codeception\Example;
diff --git a/tests/cli/Cli/Router/Route/BeforeMatchCest.php b/tests/cli/Cli/Router/Route/BeforeMatchCest.php
index da6e5bccc20..135f029219a 100644
--- a/tests/cli/Cli/Router/Route/BeforeMatchCest.php
+++ b/tests/cli/Cli/Router/Route/BeforeMatchCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router;
 use Phalcon\Cli\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class BeforeMatchCest
 {
diff --git a/tests/cli/Cli/Router/Route/CompilePatternCest.php b/tests/cli/Cli/Router/Route/CompilePatternCest.php
index 10f2f378272..6a83cf50020 100644
--- a/tests/cli/Cli/Router/Route/CompilePatternCest.php
+++ b/tests/cli/Cli/Router/Route/CompilePatternCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Codeception\Example;
diff --git a/tests/cli/Cli/Router/Route/ConstructCest.php b/tests/cli/Cli/Router/Route/ConstructCest.php
index f63364fd2c3..848fa972116 100644
--- a/tests/cli/Cli/Router/Route/ConstructCest.php
+++ b/tests/cli/Cli/Router/Route/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/ConvertCest.php b/tests/cli/Cli/Router/Route/ConvertCest.php
index 7c0076a9bf4..f33363aafbc 100644
--- a/tests/cli/Cli/Router/Route/ConvertCest.php
+++ b/tests/cli/Cli/Router/Route/ConvertCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Codeception\Example;
 use Phalcon\Cli\Router;
 use Phalcon\Cli\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ConvertCest
 {
diff --git a/tests/cli/Cli/Router/Route/ExtractNamedParamsCest.php b/tests/cli/Cli/Router/Route/ExtractNamedParamsCest.php
index ce7b251cbb7..b04acd5a67f 100644
--- a/tests/cli/Cli/Router/Route/ExtractNamedParamsCest.php
+++ b/tests/cli/Cli/Router/Route/ExtractNamedParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/GetCompiledPatternCest.php b/tests/cli/Cli/Router/Route/GetCompiledPatternCest.php
index ab4e8c7ebe0..dbf02e38dea 100644
--- a/tests/cli/Cli/Router/Route/GetCompiledPatternCest.php
+++ b/tests/cli/Cli/Router/Route/GetCompiledPatternCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/GetDelimiterCest.php b/tests/cli/Cli/Router/Route/GetDelimiterCest.php
index 5e0cbef3c8d..b8315490557 100644
--- a/tests/cli/Cli/Router/Route/GetDelimiterCest.php
+++ b/tests/cli/Cli/Router/Route/GetDelimiterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/GetPathsCest.php b/tests/cli/Cli/Router/Route/GetPathsCest.php
index 82a3c0db7bb..10f8886d50d 100644
--- a/tests/cli/Cli/Router/Route/GetPathsCest.php
+++ b/tests/cli/Cli/Router/Route/GetPathsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Codeception\Example;
 use Phalcon\Cli\Router;
 use Phalcon\Cli\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetPathsCest
 {
diff --git a/tests/cli/Cli/Router/Route/GetPatternCest.php b/tests/cli/Cli/Router/Route/GetPatternCest.php
index 7149ab3620d..e670478f6c6 100644
--- a/tests/cli/Cli/Router/Route/GetPatternCest.php
+++ b/tests/cli/Cli/Router/Route/GetPatternCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/GetReversedPathsCest.php b/tests/cli/Cli/Router/Route/GetReversedPathsCest.php
index 642e49c1638..9ed065c5a3d 100644
--- a/tests/cli/Cli/Router/Route/GetReversedPathsCest.php
+++ b/tests/cli/Cli/Router/Route/GetReversedPathsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Codeception\Example;
 use Phalcon\Cli\Router;
 use Phalcon\Cli\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetReversedPathsCest
 {
diff --git a/tests/cli/Cli/Router/Route/GetRouteIdCest.php b/tests/cli/Cli/Router/Route/GetRouteIdCest.php
index 2b3db16a55a..acde05199dd 100644
--- a/tests/cli/Cli/Router/Route/GetRouteIdCest.php
+++ b/tests/cli/Cli/Router/Route/GetRouteIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/GetSetDescriptionCest.php b/tests/cli/Cli/Router/Route/GetSetDescriptionCest.php
index 2463163e5d4..10a685e9a40 100644
--- a/tests/cli/Cli/Router/Route/GetSetDescriptionCest.php
+++ b/tests/cli/Cli/Router/Route/GetSetDescriptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/Route/GetSetNameCest.php b/tests/cli/Cli/Router/Route/GetSetNameCest.php
index 1f1a26a79ea..8d43ba661f6 100644
--- a/tests/cli/Cli/Router/Route/GetSetNameCest.php
+++ b/tests/cli/Cli/Router/Route/GetSetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/Route/ResetCest.php b/tests/cli/Cli/Router/Route/ResetCest.php
index c2140eb8769..d9fab3d5abf 100644
--- a/tests/cli/Cli/Router/Route/ResetCest.php
+++ b/tests/cli/Cli/Router/Route/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router\Route;
+namespace Phalcon\Tests\Cli\Cli\Router\Route;
 
 use CliTester;
 use Phalcon\Cli\Router\Route;
diff --git a/tests/cli/Cli/Router/SetDefaultActionCest.php b/tests/cli/Cli/Router/SetDefaultActionCest.php
index 7dc33abdb11..31969c98286 100644
--- a/tests/cli/Cli/Router/SetDefaultActionCest.php
+++ b/tests/cli/Cli/Router/SetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/SetDefaultModuleCest.php b/tests/cli/Cli/Router/SetDefaultModuleCest.php
index 36778a323d7..f1c0d745618 100644
--- a/tests/cli/Cli/Router/SetDefaultModuleCest.php
+++ b/tests/cli/Cli/Router/SetDefaultModuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/SetDefaultTaskCest.php b/tests/cli/Cli/Router/SetDefaultTaskCest.php
index 3b36c68db2c..18810f2ebcc 100644
--- a/tests/cli/Cli/Router/SetDefaultTaskCest.php
+++ b/tests/cli/Cli/Router/SetDefaultTaskCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/SetDefaultsCest.php b/tests/cli/Cli/Router/SetDefaultsCest.php
index f9a354bf5c8..dbab3fb9b35 100644
--- a/tests/cli/Cli/Router/SetDefaultsCest.php
+++ b/tests/cli/Cli/Router/SetDefaultsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Router/WasMatchedCest.php b/tests/cli/Cli/Router/WasMatchedCest.php
index 6beaa76d5d8..7aacd9a32dd 100644
--- a/tests/cli/Cli/Router/WasMatchedCest.php
+++ b/tests/cli/Cli/Router/WasMatchedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Router;
+namespace Phalcon\Tests\Cli\Cli\Router;
 
 use CliTester;
 use Phalcon\Cli\Router;
diff --git a/tests/cli/Cli/Task/ConstructCest.php b/tests/cli/Cli/Task/ConstructCest.php
index 3dcca3c8cb1..39a0ae09e67 100644
--- a/tests/cli/Cli/Task/ConstructCest.php
+++ b/tests/cli/Cli/Task/ConstructCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Task;
+namespace Phalcon\Tests\Cli\Cli\Task;
 
 use CliTester;
 use Phalcon\Cli\Task;
 use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
 use Phalcon\Registry;
-use Phalcon\Test\Fixtures\Tasks\EchoTask;
-use Phalcon\Test\Fixtures\Tasks\MainTask;
-use Phalcon\Test\Fixtures\Tasks\OnConstructTask;
+use Phalcon\Tests\Fixtures\Tasks\EchoTask;
+use Phalcon\Tests\Fixtures\Tasks\MainTask;
+use Phalcon\Tests\Fixtures\Tasks\OnConstructTask;
 
 class ConstructCest
 {
diff --git a/tests/cli/Cli/Task/GetEventsManagerCest.php b/tests/cli/Cli/Task/GetEventsManagerCest.php
index ec8fc7ab74c..effcc15de51 100644
--- a/tests/cli/Cli/Task/GetEventsManagerCest.php
+++ b/tests/cli/Cli/Task/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Task;
+namespace Phalcon\Tests\Cli\Cli\Task;
 
 use CliTester;
 use Phalcon\Cli\Task;
diff --git a/tests/cli/Cli/Task/GetSetDICest.php b/tests/cli/Cli/Task/GetSetDICest.php
index 1642ee25370..53f3b26c5ed 100644
--- a/tests/cli/Cli/Task/GetSetDICest.php
+++ b/tests/cli/Cli/Task/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Task;
+namespace Phalcon\Tests\Cli\Cli\Task;
 
 use CliTester;
 use Phalcon\Cli\Task;
diff --git a/tests/cli/Cli/Task/SetEventsManagerCest.php b/tests/cli/Cli/Task/SetEventsManagerCest.php
index 17a48b5d9f3..960b55ea810 100644
--- a/tests/cli/Cli/Task/SetEventsManagerCest.php
+++ b/tests/cli/Cli/Task/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Task;
+namespace Phalcon\Tests\Cli\Cli\Task;
 
 use CliTester;
 use Phalcon\Cli\Task;
diff --git a/tests/cli/Cli/Task/UnderscoreGetCest.php b/tests/cli/Cli/Task/UnderscoreGetCest.php
index c85a7219322..9e5106e9a3f 100644
--- a/tests/cli/Cli/Task/UnderscoreGetCest.php
+++ b/tests/cli/Cli/Task/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Cli\Task;
+namespace Phalcon\Tests\Cli\Cli\Task;
 
 use CliTester;
 use Phalcon\Cli\Task;
diff --git a/tests/cli/Di/FactoryDefault/Cli/AttemptCest.php b/tests/cli/Di/FactoryDefault/Cli/AttemptCest.php
index e100d74e9e7..8b55dbbb564 100644
--- a/tests/cli/Di/FactoryDefault/Cli/AttemptCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/AttemptCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php b/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php
index 49b68078d52..6046f9cc195 100644
--- a/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Codeception\Example;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetCest.php b/tests/cli/Di/FactoryDefault/Cli/GetCest.php
index 3ee779f64b2..2e7bfd9bf87 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\Exception;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php b/tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php
index 1c4ff4c8a86..cac24e0da5a 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php b/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php
index 7544da2a72c..9a0998f899d 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetRawCest.php b/tests/cli/Di/FactoryDefault/Cli/GetRawCest.php
index ad523c46999..05f18b3122b 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetRawCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetRawCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\Exception;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetServiceCest.php b/tests/cli/Di/FactoryDefault/Cli/GetServiceCest.php
index 4c9d0d0b2bb..310acf2d35a 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetServiceCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\Exception;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetServicesCest.php b/tests/cli/Di/FactoryDefault/Cli/GetServicesCest.php
index c35778b7d79..a1a06e7f367 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetServicesCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetServicesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php b/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php
index 148613dd39b..4da86d21486 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Crypt;
diff --git a/tests/cli/Di/FactoryDefault/Cli/HasCest.php b/tests/cli/Di/FactoryDefault/Cli/HasCest.php
index 60455a47054..f332d57dcf4 100644
--- a/tests/cli/Di/FactoryDefault/Cli/HasCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/LoadFromPhpCest.php b/tests/cli/Di/FactoryDefault/Cli/LoadFromPhpCest.php
index 38b345d9e79..d66cb0e249e 100644
--- a/tests/cli/Di/FactoryDefault/Cli/LoadFromPhpCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/LoadFromPhpCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Config;
diff --git a/tests/cli/Di/FactoryDefault/Cli/LoadFromYamlCest.php b/tests/cli/Di/FactoryDefault/Cli/LoadFromYamlCest.php
index e89b32f7c89..b489c9979d3 100644
--- a/tests/cli/Di/FactoryDefault/Cli/LoadFromYamlCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/LoadFromYamlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Config;
diff --git a/tests/cli/Di/FactoryDefault/Cli/OffsetExistsCest.php b/tests/cli/Di/FactoryDefault/Cli/OffsetExistsCest.php
index b9bb20190b1..0bf631aefe9 100644
--- a/tests/cli/Di/FactoryDefault/Cli/OffsetExistsCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/OffsetGetCest.php b/tests/cli/Di/FactoryDefault/Cli/OffsetGetCest.php
index 1cf7dc12c29..a7f921f75b8 100644
--- a/tests/cli/Di/FactoryDefault/Cli/OffsetGetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\Exception;
diff --git a/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php b/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php
index 6dfaa8e9190..e091cea6c57 100644
--- a/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Crypt;
diff --git a/tests/cli/Di/FactoryDefault/Cli/OffsetUnsetCest.php b/tests/cli/Di/FactoryDefault/Cli/OffsetUnsetCest.php
index 9f2f70f7be3..7af13af0fb9 100644
--- a/tests/cli/Di/FactoryDefault/Cli/OffsetUnsetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/RegisterCest.php b/tests/cli/Di/FactoryDefault/Cli/RegisterCest.php
index 6f441fa6aac..353f16804ef 100644
--- a/tests/cli/Di/FactoryDefault/Cli/RegisterCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/RegisterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/RemoveCest.php b/tests/cli/Di/FactoryDefault/Cli/RemoveCest.php
index 0958126c78d..b82b5ef04c1 100644
--- a/tests/cli/Di/FactoryDefault/Cli/RemoveCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/ResetCest.php b/tests/cli/Di/FactoryDefault/Cli/ResetCest.php
index 2e1c16a087a..8d58ed1523d 100644
--- a/tests/cli/Di/FactoryDefault/Cli/ResetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetCest.php b/tests/cli/Di/FactoryDefault/Cli/SetCest.php
index ae0af0a1c3e..acf6b4302f6 100644
--- a/tests/cli/Di/FactoryDefault/Cli/SetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Crypt;
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php b/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php
index 4e1b08de19a..a1f10e62279 100644
--- a/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetInternalEventsManagerCest.php b/tests/cli/Di/FactoryDefault/Cli/SetInternalEventsManagerCest.php
index 4830a2e1d06..861d391587a 100644
--- a/tests/cli/Di/FactoryDefault/Cli/SetInternalEventsManagerCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/SetInternalEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetServiceCest.php b/tests/cli/Di/FactoryDefault/Cli/SetServiceCest.php
index 6823ccec3d1..43cce86492b 100644
--- a/tests/cli/Di/FactoryDefault/Cli/SetServiceCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/SetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli;
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetSharedCest.php b/tests/cli/Di/FactoryDefault/Cli/SetSharedCest.php
index d55acae1da6..77e67066b4c 100644
--- a/tests/cli/Di/FactoryDefault/Cli/SetSharedCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/SetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
diff --git a/tests/cli/Di/FactoryDefault/Cli/UnderscoreCallCest.php b/tests/cli/Di/FactoryDefault/Cli/UnderscoreCallCest.php
index f090ff58779..792ced7c344 100644
--- a/tests/cli/Di/FactoryDefault/Cli/UnderscoreCallCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/UnderscoreCallCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Cli\Di\FactoryDefault\Cli;
+namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
 use Phalcon\Di\Exception;
diff --git a/tests/database/DataMapper/Pdo/Connection/CommitInTransactionRollBackCest.php b/tests/database/DataMapper/Pdo/Connection/CommitInTransactionRollBackCest.php
index bd8a16c6f72..5fb38e54c00 100644
--- a/tests/database/DataMapper/Pdo/Connection/CommitInTransactionRollBackCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/CommitInTransactionRollBackCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 use function date;
 use function uniqid;
diff --git a/tests/database/DataMapper/Pdo/Connection/ConnectDisconnectIsConnectedCest.php b/tests/database/DataMapper/Pdo/Connection/ConnectDisconnectIsConnectedCest.php
index e5d75cb95e4..c7855c358be 100644
--- a/tests/database/DataMapper/Pdo/Connection/ConnectDisconnectIsConnectedCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/ConnectDisconnectIsConnectedCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/ConstructCest.php b/tests/database/DataMapper/Pdo/Connection/ConstructCest.php
index 35dd8e8393b..b05c60fc89c 100644
--- a/tests/database/DataMapper/Pdo/Connection/ConstructCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use InvalidArgumentException;
diff --git a/tests/database/DataMapper/Pdo/Connection/DebugInfoCest.php b/tests/database/DataMapper/Pdo/Connection/DebugInfoCest.php
index 9368f12e113..0db39750ab7 100644
--- a/tests/database/DataMapper/Pdo/Connection/DebugInfoCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/DebugInfoCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Pdo/Connection/Decorated/ConstructCest.php b/tests/database/DataMapper/Pdo/Connection/Decorated/ConstructCest.php
index 9597443e678..d3c84217b8a 100644
--- a/tests/database/DataMapper/Pdo/Connection/Decorated/ConstructCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/Decorated/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection\Decorated;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection\Decorated;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Pdo/Connection/Decorated/DisconnectCest.php b/tests/database/DataMapper/Pdo/Connection/Decorated/DisconnectCest.php
index 344bd685b3e..4b70a78501e 100644
--- a/tests/database/DataMapper/Pdo/Connection/Decorated/DisconnectCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/Decorated/DisconnectCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection\Decorated;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection\Decorated;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Pdo/Connection/ErrorCodeCest.php b/tests/database/DataMapper/Pdo/Connection/ErrorCodeCest.php
index 6745222835b..78a1b927a97 100644
--- a/tests/database/DataMapper/Pdo/Connection/ErrorCodeCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/ErrorCodeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/ErrorInfoCest.php b/tests/database/DataMapper/Pdo/Connection/ErrorInfoCest.php
index 16518d9973e..cbdae5339b4 100644
--- a/tests/database/DataMapper/Pdo/Connection/ErrorInfoCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/ErrorInfoCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/ExecCest.php b/tests/database/DataMapper/Pdo/Connection/ExecCest.php
index 92f57c75e18..ee99b8005d2 100644
--- a/tests/database/DataMapper/Pdo/Connection/ExecCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/ExecCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class ExecCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchAffectedCest.php b/tests/database/DataMapper/Pdo/Connection/FetchAffectedCest.php
index 694db76d17a..8cbe79e18f6 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchAffectedCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchAffectedCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchAffectedCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchAllCest.php b/tests/database/DataMapper/Pdo/Connection/FetchAllCest.php
index 7a89c5c57bf..384cfcd047e 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchAllCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchAllCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchAllCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchAssocCest.php b/tests/database/DataMapper/Pdo/Connection/FetchAssocCest.php
index 5b7eda72fd9..fd4ce1006a2 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchAssocCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchAssocCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchAssocCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchColumnCest.php b/tests/database/DataMapper/Pdo/Connection/FetchColumnCest.php
index db704f15f79..afdf98e6757 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchColumnCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchColumnCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchColumnCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchGroupCest.php b/tests/database/DataMapper/Pdo/Connection/FetchGroupCest.php
index 18a561fa7a2..6f6ce49f45d 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchGroupCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchGroupCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchGroupCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchObjectCest.php b/tests/database/DataMapper/Pdo/Connection/FetchObjectCest.php
index 1cde45a37f6..c8bcc8d20a4 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchObjectCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchObjectCest.php
@@ -9,12 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Resultset;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Resultset;
 use stdClass;
 
 class FetchObjectCest
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchObjectsCest.php b/tests/database/DataMapper/Pdo/Connection/FetchObjectsCest.php
index 685b489f041..fa126a93401 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchObjectsCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchObjectsCest.php
@@ -9,12 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Resultset;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Resultset;
 use stdClass;
 
 class FetchObjectsCest
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchOneCest.php b/tests/database/DataMapper/Pdo/Connection/FetchOneCest.php
index 44e4f7b51e5..4fe079731cd 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchOneCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchOneCest.php
@@ -9,13 +9,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use Codeception\Example;
 use DatabaseTester;
 use PDO;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchOneCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchPairsCest.php b/tests/database/DataMapper/Pdo/Connection/FetchPairsCest.php
index 075fab4a6a3..1c68ebe5df4 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchPairsCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchPairsCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchPairsCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/FetchValueCest.php b/tests/database/DataMapper/Pdo/Connection/FetchValueCest.php
index bd202fde51f..4bb7d843e81 100644
--- a/tests/database/DataMapper/Pdo/Connection/FetchValueCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/FetchValueCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class FetchValueCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/GetAdapterCest.php b/tests/database/DataMapper/Pdo/Connection/GetAdapterCest.php
index b06a618e3af..2e1d0387451 100644
--- a/tests/database/DataMapper/Pdo/Connection/GetAdapterCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/GetAdapterCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/GetAvailableDriversCest.php b/tests/database/DataMapper/Pdo/Connection/GetAvailableDriversCest.php
index c47ef9d0101..147fe2ae299 100644
--- a/tests/database/DataMapper/Pdo/Connection/GetAvailableDriversCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/GetAvailableDriversCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Pdo/Connection/GetQuoteNamesCest.php b/tests/database/DataMapper/Pdo/Connection/GetQuoteNamesCest.php
index 5e266e039e2..4c4deccca79 100644
--- a/tests/database/DataMapper/Pdo/Connection/GetQuoteNamesCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/GetQuoteNamesCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/GetSetAttributeCest.php b/tests/database/DataMapper/Pdo/Connection/GetSetAttributeCest.php
index 3b328a08d97..42b1f45ed57 100644
--- a/tests/database/DataMapper/Pdo/Connection/GetSetAttributeCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/GetSetAttributeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Pdo/Connection/GetSetProfilerCest.php b/tests/database/DataMapper/Pdo/Connection/GetSetProfilerCest.php
index 89252c7c728..78ac65c3758 100644
--- a/tests/database/DataMapper/Pdo/Connection/GetSetProfilerCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/GetSetProfilerCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/LastInsertIdCest.php b/tests/database/DataMapper/Pdo/Connection/LastInsertIdCest.php
index 0b4d5d43721..d6042543007 100644
--- a/tests/database/DataMapper/Pdo/Connection/LastInsertIdCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/LastInsertIdCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 use function date;
 use function str_replace;
diff --git a/tests/database/DataMapper/Pdo/Connection/QueryCest.php b/tests/database/DataMapper/Pdo/Connection/QueryCest.php
index cc266bb404d..9145a0d93a4 100644
--- a/tests/database/DataMapper/Pdo/Connection/QueryCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/QueryCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class QueryCest
 {
diff --git a/tests/database/DataMapper/Pdo/Connection/QuoteCest.php b/tests/database/DataMapper/Pdo/Connection/QuoteCest.php
index 3876573c937..80fd1c6dd5b 100644
--- a/tests/database/DataMapper/Pdo/Connection/QuoteCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/QuoteCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
diff --git a/tests/database/DataMapper/Pdo/Connection/UnderscoreCallCest.php b/tests/database/DataMapper/Pdo/Connection/UnderscoreCallCest.php
index 3894753bce5..6de59862d1a 100644
--- a/tests/database/DataMapper/Pdo/Connection/UnderscoreCallCest.php
+++ b/tests/database/DataMapper/Pdo/Connection/UnderscoreCallCest.php
@@ -9,12 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Connection;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Connection;
 
 use BadMethodCallException;
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Connection;
-use Phalcon\Test\Fixtures\DataMapper\Pdo\ConnectionFixture;
+use Phalcon\Tests\Fixtures\DataMapper\Pdo\ConnectionFixture;
 
 class UnderscoreCallCest
 {
diff --git a/tests/database/DataMapper/Pdo/ConnectionLocator/ConstructCest.php b/tests/database/DataMapper/Pdo/ConnectionLocator/ConstructCest.php
index 95339367937..f506af70b84 100644
--- a/tests/database/DataMapper/Pdo/ConnectionLocator/ConstructCest.php
+++ b/tests/database/DataMapper/Pdo/ConnectionLocator/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\ConnectionLocator;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\ConnectionLocator;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\ConnectionLocator;
diff --git a/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetMasterCest.php b/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetMasterCest.php
index 8247a7ad13b..b4fea794fa0 100644
--- a/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetMasterCest.php
+++ b/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetMasterCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\ConnectionLocator;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\ConnectionLocator;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\ConnectionLocator;
diff --git a/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetReadCest.php b/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetReadCest.php
index 48a92bcf159..d6dffd7d68c 100644
--- a/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetReadCest.php
+++ b/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetReadCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\ConnectionLocator;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\ConnectionLocator;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\ConnectionLocator;
diff --git a/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetWriteCest.php b/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetWriteCest.php
index 1738b76d010..2748531b745 100644
--- a/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetWriteCest.php
+++ b/tests/database/DataMapper/Pdo/ConnectionLocator/GetSetWriteCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\ConnectionLocator;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\ConnectionLocator;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\ConnectionLocator;
diff --git a/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LevelsCest.php b/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LevelsCest.php
index 766321b7178..5688f2e3deb 100644
--- a/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LevelsCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LevelsCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\MemoryLogger;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\MemoryLogger;
 
 use Codeception\Example;
 use DatabaseTester;
diff --git a/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LogCest.php b/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LogCest.php
index 78ecedd8d30..f59b71ef276 100644
--- a/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LogCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LogCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\MemoryLogger;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\MemoryLogger;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\MemoryLogger;
diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/ConstructCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/ConstructCest.php
index f3cd0bc4c91..b562492af63 100644
--- a/tests/database/DataMapper/Pdo/Profiler/Profiler/ConstructCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/Profiler/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\Profiler;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\Profiler;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\Profiler;
diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetLoggerCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetLoggerCest.php
index e848c32819c..86c220a4fe3 100644
--- a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetLoggerCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetLoggerCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\Profiler;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\Profiler;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\MemoryLogger;
diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogFormatCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogFormatCest.php
index a5861a5b69c..57b0116b84b 100644
--- a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogFormatCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogFormatCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\Profiler;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\Profiler;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\Profiler;
diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogLevelCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogLevelCest.php
index e5348d900b5..121377c8e04 100644
--- a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogLevelCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogLevelCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\Profiler;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\Profiler;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\Profiler;
diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/IsSetActiveCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/IsSetActiveCest.php
index f1126b412b2..4cd9213bf75 100644
--- a/tests/database/DataMapper/Pdo/Profiler/Profiler/IsSetActiveCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/Profiler/IsSetActiveCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\Profiler;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\Profiler;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\Profiler;
diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/StartFinishCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/StartFinishCest.php
index c3052d22118..70da28a20df 100644
--- a/tests/database/DataMapper/Pdo/Profiler/Profiler/StartFinishCest.php
+++ b/tests/database/DataMapper/Pdo/Profiler/Profiler/StartFinishCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Pdo\Profiler\Profiler;
+namespace Phalcon\Tests\Database\DataMapper\Pdo\Profiler\Profiler;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\Profiler;
diff --git a/tests/database/DataMapper/Query/Bind/BindInlineCest.php b/tests/database/DataMapper/Query/Bind/BindInlineCest.php
index e4a42df71bf..1dc3de616cd 100644
--- a/tests/database/DataMapper/Query/Bind/BindInlineCest.php
+++ b/tests/database/DataMapper/Query/Bind/BindInlineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Bind;
+namespace Phalcon\Tests\Database\DataMapper\Query\Bind;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Bind/RemoveCest.php b/tests/database/DataMapper/Query/Bind/RemoveCest.php
index 89dedea1418..471e062acdd 100644
--- a/tests/database/DataMapper/Query/Bind/RemoveCest.php
+++ b/tests/database/DataMapper/Query/Bind/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Bind;
+namespace Phalcon\Tests\Database\DataMapper\Query\Bind;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Bind/SetValuesCest.php b/tests/database/DataMapper/Query/Bind/SetValuesCest.php
index 57cbccb0d5a..f6639265986 100644
--- a/tests/database/DataMapper/Query/Bind/SetValuesCest.php
+++ b/tests/database/DataMapper/Query/Bind/SetValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Bind;
+namespace Phalcon\Tests\Database\DataMapper\Query\Bind;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\Bind;
diff --git a/tests/database/DataMapper/Query/Delete/GetBindValuesCest.php b/tests/database/DataMapper/Query/Delete/GetBindValuesCest.php
index 8acb8521b85..4dd470b1803 100644
--- a/tests/database/DataMapper/Query/Delete/GetBindValuesCest.php
+++ b/tests/database/DataMapper/Query/Delete/GetBindValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Delete;
+namespace Phalcon\Tests\Database\DataMapper\Query\Delete;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Delete/GetStatementCest.php b/tests/database/DataMapper/Query/Delete/GetStatementCest.php
index 43ab7cf494b..d6470b6057d 100644
--- a/tests/database/DataMapper/Query/Delete/GetStatementCest.php
+++ b/tests/database/DataMapper/Query/Delete/GetStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Delete;
+namespace Phalcon\Tests\Database\DataMapper\Query\Delete;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Insert/GetBindValuesCest.php b/tests/database/DataMapper/Query/Insert/GetBindValuesCest.php
index 70ee348bcaa..14d967845fe 100644
--- a/tests/database/DataMapper/Query/Insert/GetBindValuesCest.php
+++ b/tests/database/DataMapper/Query/Insert/GetBindValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Insert;
+namespace Phalcon\Tests\Database\DataMapper\Query\Insert;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Insert/GetLastInsertIdCest.php b/tests/database/DataMapper/Query/Insert/GetLastInsertIdCest.php
index eca2113c9ef..207b8365d2d 100644
--- a/tests/database/DataMapper/Query/Insert/GetLastInsertIdCest.php
+++ b/tests/database/DataMapper/Query/Insert/GetLastInsertIdCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Insert;
+namespace Phalcon\Tests\Database\DataMapper\Query\Insert;
 
 use Codeception\Stub;
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
-use Phalcon\Test\Fixtures\Migrations\Invoices;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 use function uniqid;
 
diff --git a/tests/database/DataMapper/Query/Insert/GetStatementCest.php b/tests/database/DataMapper/Query/Insert/GetStatementCest.php
index cb7c6e776e0..06fe34bb8f8 100644
--- a/tests/database/DataMapper/Query/Insert/GetStatementCest.php
+++ b/tests/database/DataMapper/Query/Insert/GetStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Insert;
+namespace Phalcon\Tests\Database\DataMapper\Query\Insert;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/QueryFactory/ConstructCest.php b/tests/database/DataMapper/Query/QueryFactory/ConstructCest.php
index 9dbaf062fdd..438bafeb82c 100644
--- a/tests/database/DataMapper/Query/QueryFactory/ConstructCest.php
+++ b/tests/database/DataMapper/Query/QueryFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\QueryFactory;
+namespace Phalcon\Tests\Database\DataMapper\Query\QueryFactory;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/QueryFactory/NewBindCest.php b/tests/database/DataMapper/Query/QueryFactory/NewBindCest.php
index 0cf9dd68dff..89c2c0efda5 100644
--- a/tests/database/DataMapper/Query/QueryFactory/NewBindCest.php
+++ b/tests/database/DataMapper/Query/QueryFactory/NewBindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\QueryFactory;
+namespace Phalcon\Tests\Database\DataMapper\Query\QueryFactory;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\Bind;
diff --git a/tests/database/DataMapper/Query/QueryFactory/NewDeleteCest.php b/tests/database/DataMapper/Query/QueryFactory/NewDeleteCest.php
index af430402843..dab94a76422 100644
--- a/tests/database/DataMapper/Query/QueryFactory/NewDeleteCest.php
+++ b/tests/database/DataMapper/Query/QueryFactory/NewDeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\QueryFactory;
+namespace Phalcon\Tests\Database\DataMapper\Query\QueryFactory;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\Delete;
diff --git a/tests/database/DataMapper/Query/QueryFactory/NewInsertCest.php b/tests/database/DataMapper/Query/QueryFactory/NewInsertCest.php
index fc2b0e32735..ea4b93f984e 100644
--- a/tests/database/DataMapper/Query/QueryFactory/NewInsertCest.php
+++ b/tests/database/DataMapper/Query/QueryFactory/NewInsertCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\QueryFactory;
+namespace Phalcon\Tests\Database\DataMapper\Query\QueryFactory;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\Insert;
diff --git a/tests/database/DataMapper/Query/QueryFactory/NewSelectCest.php b/tests/database/DataMapper/Query/QueryFactory/NewSelectCest.php
index 31a03bb20e3..6f37f4adc20 100644
--- a/tests/database/DataMapper/Query/QueryFactory/NewSelectCest.php
+++ b/tests/database/DataMapper/Query/QueryFactory/NewSelectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\QueryFactory;
+namespace Phalcon\Tests\Database\DataMapper\Query\QueryFactory;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/QueryFactory/NewUpdateCest.php b/tests/database/DataMapper/Query/QueryFactory/NewUpdateCest.php
index f26ad72b00f..7ae2de47f13 100644
--- a/tests/database/DataMapper/Query/QueryFactory/NewUpdateCest.php
+++ b/tests/database/DataMapper/Query/QueryFactory/NewUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\QueryFactory;
+namespace Phalcon\Tests\Database\DataMapper\Query\QueryFactory;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/AsAliasCest.php b/tests/database/DataMapper/Query/Select/AsAliasCest.php
index d3c680bddab..a0503e00318 100644
--- a/tests/database/DataMapper/Query/Select/AsAliasCest.php
+++ b/tests/database/DataMapper/Query/Select/AsAliasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/ColumnsCest.php b/tests/database/DataMapper/Query/Select/ColumnsCest.php
index d01225b672d..925d710595a 100644
--- a/tests/database/DataMapper/Query/Select/ColumnsCest.php
+++ b/tests/database/DataMapper/Query/Select/ColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/ConstructCest.php b/tests/database/DataMapper/Query/Select/ConstructCest.php
index a6cfff06dac..1d696a96b09 100644
--- a/tests/database/DataMapper/Query/Select/ConstructCest.php
+++ b/tests/database/DataMapper/Query/Select/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\Bind;
diff --git a/tests/database/DataMapper/Query/Select/DistinctCest.php b/tests/database/DataMapper/Query/Select/DistinctCest.php
index 90120fd2f76..a3e79952e70 100644
--- a/tests/database/DataMapper/Query/Select/DistinctCest.php
+++ b/tests/database/DataMapper/Query/Select/DistinctCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/ForUpdateCest.php b/tests/database/DataMapper/Query/Select/ForUpdateCest.php
index 8766c64fa89..5d60b423de8 100644
--- a/tests/database/DataMapper/Query/Select/ForUpdateCest.php
+++ b/tests/database/DataMapper/Query/Select/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/FromCest.php b/tests/database/DataMapper/Query/Select/FromCest.php
index 0afe37416f0..b3acd9691c3 100644
--- a/tests/database/DataMapper/Query/Select/FromCest.php
+++ b/tests/database/DataMapper/Query/Select/FromCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/GetBindValuesCest.php b/tests/database/DataMapper/Query/Select/GetBindValuesCest.php
index 4888162a703..fbde848e14e 100644
--- a/tests/database/DataMapper/Query/Select/GetBindValuesCest.php
+++ b/tests/database/DataMapper/Query/Select/GetBindValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Select/GroupByCest.php b/tests/database/DataMapper/Query/Select/GroupByCest.php
index 1534840cb5f..0f1e9f33c2e 100644
--- a/tests/database/DataMapper/Query/Select/GroupByCest.php
+++ b/tests/database/DataMapper/Query/Select/GroupByCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/HavingCest.php b/tests/database/DataMapper/Query/Select/HavingCest.php
index b201da2fac3..e223fe59bef 100644
--- a/tests/database/DataMapper/Query/Select/HavingCest.php
+++ b/tests/database/DataMapper/Query/Select/HavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Select/JoinCest.php b/tests/database/DataMapper/Query/Select/JoinCest.php
index 96fd465665c..c5711551ddc 100644
--- a/tests/database/DataMapper/Query/Select/JoinCest.php
+++ b/tests/database/DataMapper/Query/Select/JoinCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Select/LimitOffsetCest.php b/tests/database/DataMapper/Query/Select/LimitOffsetCest.php
index 4afea9306d9..23e35cc24d3 100644
--- a/tests/database/DataMapper/Query/Select/LimitOffsetCest.php
+++ b/tests/database/DataMapper/Query/Select/LimitOffsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use Codeception\Stub;
 use DatabaseTester;
diff --git a/tests/database/DataMapper/Query/Select/OrderByCest.php b/tests/database/DataMapper/Query/Select/OrderByCest.php
index e81a1ef606c..f8b0432a237 100644
--- a/tests/database/DataMapper/Query/Select/OrderByCest.php
+++ b/tests/database/DataMapper/Query/Select/OrderByCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/QuoteIdentifierCest.php b/tests/database/DataMapper/Query/Select/QuoteIdentifierCest.php
index 777b6bccf29..fd9bb25174f 100644
--- a/tests/database/DataMapper/Query/Select/QuoteIdentifierCest.php
+++ b/tests/database/DataMapper/Query/Select/QuoteIdentifierCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/SetFlagCest.php b/tests/database/DataMapper/Query/Select/SetFlagCest.php
index 76a95b86987..a5dffda6023 100644
--- a/tests/database/DataMapper/Query/Select/SetFlagCest.php
+++ b/tests/database/DataMapper/Query/Select/SetFlagCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/SubSelectCest.php b/tests/database/DataMapper/Query/Select/SubSelectCest.php
index e86b263f600..93d165c6d21 100644
--- a/tests/database/DataMapper/Query/Select/SubSelectCest.php
+++ b/tests/database/DataMapper/Query/Select/SubSelectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/UnderscoreCallCest.php b/tests/database/DataMapper/Query/Select/UnderscoreCallCest.php
index b7754e5606e..13fc0b5554a 100644
--- a/tests/database/DataMapper/Query/Select/UnderscoreCallCest.php
+++ b/tests/database/DataMapper/Query/Select/UnderscoreCallCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use BadMethodCallException;
 use DatabaseTester;
 use PDOStatement;
 use Phalcon\DataMapper\Query\QueryFactory;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
 
 class UnderscoreCallCest
 {
diff --git a/tests/database/DataMapper/Query/Select/UnionAllCest.php b/tests/database/DataMapper/Query/Select/UnionAllCest.php
index e21dddac32e..b1cd3fc534b 100644
--- a/tests/database/DataMapper/Query/Select/UnionAllCest.php
+++ b/tests/database/DataMapper/Query/Select/UnionAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/UnionCest.php b/tests/database/DataMapper/Query/Select/UnionCest.php
index a004f460111..73d45fc3437 100644
--- a/tests/database/DataMapper/Query/Select/UnionCest.php
+++ b/tests/database/DataMapper/Query/Select/UnionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/WhereCest.php b/tests/database/DataMapper/Query/Select/WhereCest.php
index 3341301ece3..76469f01755 100644
--- a/tests/database/DataMapper/Query/Select/WhereCest.php
+++ b/tests/database/DataMapper/Query/Select/WhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Select/WhereEqualsCest.php b/tests/database/DataMapper/Query/Select/WhereEqualsCest.php
index 283cb51c29a..f607250f1c8 100644
--- a/tests/database/DataMapper/Query/Select/WhereEqualsCest.php
+++ b/tests/database/DataMapper/Query/Select/WhereEqualsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Select;
+namespace Phalcon\Tests\Database\DataMapper\Query\Select;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/DataMapper/Query/Update/GetBindValuesCest.php b/tests/database/DataMapper/Query/Update/GetBindValuesCest.php
index c40d1ad6f10..2dcd1424c91 100644
--- a/tests/database/DataMapper/Query/Update/GetBindValuesCest.php
+++ b/tests/database/DataMapper/Query/Update/GetBindValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Update;
+namespace Phalcon\Tests\Database\DataMapper\Query\Update;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Update/GetStatementCest.php b/tests/database/DataMapper/Query/Update/GetStatementCest.php
index 95ddf68a202..52d33dad9ed 100644
--- a/tests/database/DataMapper/Query/Update/GetStatementCest.php
+++ b/tests/database/DataMapper/Query/Update/GetStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Update;
+namespace Phalcon\Tests\Database\DataMapper\Query\Update;
 
 use DatabaseTester;
 use PDO;
diff --git a/tests/database/DataMapper/Query/Update/HasColumnsCest.php b/tests/database/DataMapper/Query/Update/HasColumnsCest.php
index 9d1c57a7b6c..385a0f471a5 100644
--- a/tests/database/DataMapper/Query/Update/HasColumnsCest.php
+++ b/tests/database/DataMapper/Query/Update/HasColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\DataMapper\Query\Update;
+namespace Phalcon\Tests\Database\DataMapper\Query\Update;
 
 use DatabaseTester;
 use Phalcon\DataMapper\Query\QueryFactory;
diff --git a/tests/database/Db/Adapter/Pdo/ConnectCest.php b/tests/database/Db/Adapter/Pdo/ConnectCest.php
index 0bde518c512..d8aa5ee9507 100644
--- a/tests/database/Db/Adapter/Pdo/ConnectCest.php
+++ b/tests/database/Db/Adapter/Pdo/ConnectCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Database\Db\Adapter\Pdo;
 
 use DatabaseTester;
 use Phalcon\Db\Adapter\PdoFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function getOptionsMysql;
 
diff --git a/tests/database/Db/Adapter/Pdo/DeleteCest.php b/tests/database/Db/Adapter/Pdo/DeleteCest.php
index 9ccced7974d..9653e2f21f9 100644
--- a/tests/database/Db/Adapter/Pdo/DeleteCest.php
+++ b/tests/database/Db/Adapter/Pdo/DeleteCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Database\Db\Adapter\Pdo;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 final class DeleteCest
 {
diff --git a/tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php b/tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php
index 9697991645c..0eefeca5a2d 100644
--- a/tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php
+++ b/tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Database\Db\Adapter\Pdo;
 
 use DatabaseTester;
 use Phalcon\Db\Column;
-use Phalcon\Test\Fixtures\Migrations\ComplexDefaultMigration;
-use Phalcon\Test\Fixtures\Migrations\DialectMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Migrations\ComplexDefaultMigration;
+use Phalcon\Tests\Fixtures\Migrations\DialectMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeColumnsCest
 {
diff --git a/tests/database/Db/Adapter/Pdo/ExecInsertCest.php b/tests/database/Db/Adapter/Pdo/ExecInsertCest.php
index aede90e90e8..992ee2dd2ec 100644
--- a/tests/database/Db/Adapter/Pdo/ExecInsertCest.php
+++ b/tests/database/Db/Adapter/Pdo/ExecInsertCest.php
@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Database\Db\Adapter\Pdo;
 
 use DatabaseTester;
 use Phalcon\Db\Adapter\Pdo\AbstractPdo;
 use Phalcon\Db\Adapter\Pdo\Mysql;
 use Phalcon\Db\Column;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\AbstractMigration;
-use Phalcon\Test\Fixtures\Migrations\ComplexDefaultMigration;
-use Phalcon\Test\Fixtures\Migrations\DialectMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Migrations\AbstractMigration;
+use Phalcon\Tests\Fixtures\Migrations\ComplexDefaultMigration;
+use Phalcon\Tests\Fixtures\Migrations\DialectMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use PHPUnit\Framework\Assert;
 
 use function array_keys;
diff --git a/tests/database/Db/Adapter/Pdo/QueryCest.php b/tests/database/Db/Adapter/Pdo/QueryCest.php
index cebf6be0e0c..14586ec6856 100644
--- a/tests/database/Db/Adapter/Pdo/QueryCest.php
+++ b/tests/database/Db/Adapter/Pdo/QueryCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Database\Db\Adapter\Pdo;
 
 use DatabaseTester;
 use Phalcon\Db\Enum;
 use Phalcon\Db\Result\Pdo;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function is_array;
 use function is_object;
diff --git a/tests/database/Db/Column/ConstantsCest.php b/tests/database/Db/Column/ConstantsCest.php
index 52e0b80e507..2129cfb1bfe 100644
--- a/tests/database/Db/Column/ConstantsCest.php
+++ b/tests/database/Db/Column/ConstantsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
 use Phalcon\Db\Column;
diff --git a/tests/database/Db/Column/ConstructCest.php b/tests/database/Db/Column/ConstructCest.php
index 92e232a434f..f0285d1246d 100644
--- a/tests/database/Db/Column/ConstructCest.php
+++ b/tests/database/Db/Column/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
 use Phalcon\Db\Column;
diff --git a/tests/database/Db/Column/GetAfterPositionCest.php b/tests/database/Db/Column/GetAfterPositionCest.php
index 61e9b7fa4c1..2ac5e92492c 100644
--- a/tests/database/Db/Column/GetAfterPositionCest.php
+++ b/tests/database/Db/Column/GetAfterPositionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetAfterPositionCest
 {
diff --git a/tests/database/Db/Column/GetBindTypeCest.php b/tests/database/Db/Column/GetBindTypeCest.php
index c9caaaffcc8..f0238edbe48 100644
--- a/tests/database/Db/Column/GetBindTypeCest.php
+++ b/tests/database/Db/Column/GetBindTypeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetBindTypeCest
 {
diff --git a/tests/database/Db/Column/GetCommentCest.php b/tests/database/Db/Column/GetCommentCest.php
index 5be2d7bbf38..998f93eb36b 100644
--- a/tests/database/Db/Column/GetCommentCest.php
+++ b/tests/database/Db/Column/GetCommentCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetCommentCest
 {
diff --git a/tests/database/Db/Column/GetDefaultCest.php b/tests/database/Db/Column/GetDefaultCest.php
index 8f52aa74e55..1916664d78c 100644
--- a/tests/database/Db/Column/GetDefaultCest.php
+++ b/tests/database/Db/Column/GetDefaultCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetDefaultCest
 {
diff --git a/tests/database/Db/Column/GetNameCest.php b/tests/database/Db/Column/GetNameCest.php
index 14fe843e5de..cc98d8791a5 100644
--- a/tests/database/Db/Column/GetNameCest.php
+++ b/tests/database/Db/Column/GetNameCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetNameCest
 {
diff --git a/tests/database/Db/Column/GetScaleCest.php b/tests/database/Db/Column/GetScaleCest.php
index 68210c51cfc..aabf8915404 100644
--- a/tests/database/Db/Column/GetScaleCest.php
+++ b/tests/database/Db/Column/GetScaleCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\FractalDatesMigration;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\FractalDates;
+use Phalcon\Tests\Fixtures\Migrations\FractalDatesMigration;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\FractalDates;
 
 class GetScaleCest
 {
diff --git a/tests/database/Db/Column/GetSizeCest.php b/tests/database/Db/Column/GetSizeCest.php
index fc430c40e9d..aa093576e23 100644
--- a/tests/database/Db/Column/GetSizeCest.php
+++ b/tests/database/Db/Column/GetSizeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetSizeCest
 {
diff --git a/tests/database/Db/Column/GetTypeCest.php b/tests/database/Db/Column/GetTypeCest.php
index 05b3c9c328a..f6f4e48af0e 100644
--- a/tests/database/Db/Column/GetTypeCest.php
+++ b/tests/database/Db/Column/GetTypeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetTypeCest
 {
diff --git a/tests/database/Db/Column/GetTypeReferenceCest.php b/tests/database/Db/Column/GetTypeReferenceCest.php
index bd3feaf6868..bc8da4bab86 100644
--- a/tests/database/Db/Column/GetTypeReferenceCest.php
+++ b/tests/database/Db/Column/GetTypeReferenceCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetTypeReferenceCest
 {
diff --git a/tests/database/Db/Column/GetTypeValuesCest.php b/tests/database/Db/Column/GetTypeValuesCest.php
index 2828c188199..2d2a75f3a51 100644
--- a/tests/database/Db/Column/GetTypeValuesCest.php
+++ b/tests/database/Db/Column/GetTypeValuesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class GetTypeValuesCest
 {
diff --git a/tests/database/Db/Column/IsFirstCest.php b/tests/database/Db/Column/IsFirstCest.php
index df1d1ef9f3d..44539380a13 100644
--- a/tests/database/Db/Column/IsFirstCest.php
+++ b/tests/database/Db/Column/IsFirstCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class IsFirstCest
 {
diff --git a/tests/database/Db/Column/IsNotNullCest.php b/tests/database/Db/Column/IsNotNullCest.php
index ed0b8a7759a..51830a2730d 100644
--- a/tests/database/Db/Column/IsNotNullCest.php
+++ b/tests/database/Db/Column/IsNotNullCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class IsNotNullCest
 {
diff --git a/tests/database/Db/Column/IsNumericCest.php b/tests/database/Db/Column/IsNumericCest.php
index 47be509b449..64acc5d05f3 100644
--- a/tests/database/Db/Column/IsNumericCest.php
+++ b/tests/database/Db/Column/IsNumericCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class IsNumericCest
 {
diff --git a/tests/database/Db/Column/IsPrimaryCest.php b/tests/database/Db/Column/IsPrimaryCest.php
index ee0083d25ab..189323fc2ce 100644
--- a/tests/database/Db/Column/IsPrimaryCest.php
+++ b/tests/database/Db/Column/IsPrimaryCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class IsPrimaryCest
 {
diff --git a/tests/database/Db/Column/IsUnsignedCest.php b/tests/database/Db/Column/IsUnsignedCest.php
index 07a438ce2f2..46cf02f87cc 100644
--- a/tests/database/Db/Column/IsUnsignedCest.php
+++ b/tests/database/Db/Column/IsUnsignedCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Column;
+namespace Phalcon\Tests\Database\Db\Column;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DbTrait;
+use Phalcon\Tests\Fixtures\Traits\DbTrait;
 
 class IsUnsignedCest
 {
diff --git a/tests/database/Db/Profiler/Item/GetSetFinalTimeCest.php b/tests/database/Db/Profiler/Item/GetSetFinalTimeCest.php
index 015abe81557..8e5582d1604 100644
--- a/tests/database/Db/Profiler/Item/GetSetFinalTimeCest.php
+++ b/tests/database/Db/Profiler/Item/GetSetFinalTimeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
 
 use DatabaseTester;
 use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Db/Profiler/Item/GetSetInitialTimeCest.php b/tests/database/Db/Profiler/Item/GetSetInitialTimeCest.php
index d0d86f394d2..3019f498dcc 100644
--- a/tests/database/Db/Profiler/Item/GetSetInitialTimeCest.php
+++ b/tests/database/Db/Profiler/Item/GetSetInitialTimeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
 
 use DatabaseTester;
 use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Db/Profiler/Item/GetSetSqlBindTypesCest.php b/tests/database/Db/Profiler/Item/GetSetSqlBindTypesCest.php
index 63308259b17..4daa3d14707 100644
--- a/tests/database/Db/Profiler/Item/GetSetSqlBindTypesCest.php
+++ b/tests/database/Db/Profiler/Item/GetSetSqlBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
 
 use DatabaseTester;
 use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Db/Profiler/Item/GetSetSqlStatementCest.php b/tests/database/Db/Profiler/Item/GetSetSqlStatementCest.php
index ad538b21c30..73ccde69f97 100644
--- a/tests/database/Db/Profiler/Item/GetSetSqlStatementCest.php
+++ b/tests/database/Db/Profiler/Item/GetSetSqlStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
 
 use DatabaseTester;
 use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Db/Profiler/Item/GetSetSqlVariablesCest.php b/tests/database/Db/Profiler/Item/GetSetSqlVariablesCest.php
index a7cbe009d3b..d610a12da0c 100644
--- a/tests/database/Db/Profiler/Item/GetSetSqlVariablesCest.php
+++ b/tests/database/Db/Profiler/Item/GetSetSqlVariablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
 
 use DatabaseTester;
 use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Db/Profiler/Item/GetTotalElapsedSecondsCest.php b/tests/database/Db/Profiler/Item/GetTotalElapsedSecondsCest.php
index 3df329cc948..69b222cf59f 100644
--- a/tests/database/Db/Profiler/Item/GetTotalElapsedSecondsCest.php
+++ b/tests/database/Db/Profiler/Item/GetTotalElapsedSecondsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
 
 use DatabaseTester;
 use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Db/RawValue/ConstructCest.php b/tests/database/Db/RawValue/ConstructCest.php
index d23d8614107..16631586ae3 100644
--- a/tests/database/Db/RawValue/ConstructCest.php
+++ b/tests/database/Db/RawValue/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\RawValue;
+namespace Phalcon\Tests\Database\Db\RawValue;
 
 use Codeception\Example;
 use DatabaseTester;
diff --git a/tests/database/Db/RawValue/GetValueCest.php b/tests/database/Db/RawValue/GetValueCest.php
index d64dc2c2933..3bd6f1f33d3 100644
--- a/tests/database/Db/RawValue/GetValueCest.php
+++ b/tests/database/Db/RawValue/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\RawValue;
+namespace Phalcon\Tests\Database\Db\RawValue;
 
 use DatabaseTester;
 use Phalcon\Db\RawValue;
diff --git a/tests/database/Db/RawValue/ToStringCest.php b/tests/database/Db/RawValue/ToStringCest.php
index a39e6a9297e..6efdbcb23b8 100644
--- a/tests/database/Db/RawValue/ToStringCest.php
+++ b/tests/database/Db/RawValue/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Db\RawValue;
+namespace Phalcon\Tests\Database\Db\RawValue;
 
 use DatabaseTester;
 use Phalcon\Db\RawValue;
diff --git a/tests/database/Mvc/Model/AssignCest.php b/tests/database/Mvc/Model/AssignCest.php
index 901adaa3476..29115b3b259 100644
--- a/tests/database/Mvc/Model/AssignCest.php
+++ b/tests/database/Mvc/Model/AssignCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/AverageCest.php b/tests/database/Mvc/Model/AverageCest.php
index 78d828ecb65..d38e77e6c22 100644
--- a/tests/database/Mvc/Model/AverageCest.php
+++ b/tests/database/Mvc/Model/AverageCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class AverageCest
 {
diff --git a/tests/database/Mvc/Model/Behavior/SoftDeleteCest.php b/tests/database/Mvc/Model/Behavior/SoftDeleteCest.php
index b4411c5e82c..30c95c2397e 100644
--- a/tests/database/Mvc/Model/Behavior/SoftDeleteCest.php
+++ b/tests/database/Mvc/Model/Behavior/SoftDeleteCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Behavior;
+namespace Phalcon\Tests\Database\Mvc\Model\Behavior;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesBehavior;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesBehavior;
 use Phalcon\Events\Event;
 use Phalcon\Events\Manager as EventManager;
 
diff --git a/tests/database/Mvc/Model/Behavior/TimestampableCest.php b/tests/database/Mvc/Model/Behavior/TimestampableCest.php
index ded64ca3ca1..b7be504e770 100644
--- a/tests/database/Mvc/Model/Behavior/TimestampableCest.php
+++ b/tests/database/Mvc/Model/Behavior/TimestampableCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Behavior;
+namespace Phalcon\Tests\Database\Mvc\Model\Behavior;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesBehavior;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesBehavior;
 use Phalcon\Events\Event;
 use Phalcon\Events\Manager as EventManager;
 use DateTime;
diff --git a/tests/database/Mvc/Model/CloneResultMapCest.php b/tests/database/Mvc/Model/CloneResultMapCest.php
index 943e7d13c92..eab2182ba6f 100644
--- a/tests/database/Mvc/Model/CloneResultMapCest.php
+++ b/tests/database/Mvc/Model/CloneResultMapCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use Codeception\Example;
 use DatabaseTester;
 use PDO;
 use Phalcon\Mvc\Model;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\InvoicesMap;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\InvoicesMap;
 
 /**
  * Class CloneResultMapCest
diff --git a/tests/database/Mvc/Model/ConstructCest.php b/tests/database/Mvc/Model/ConstructCest.php
index 7bac7285f68..6aa098b1112 100644
--- a/tests/database/Mvc/Model/ConstructCest.php
+++ b/tests/database/Mvc/Model/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\ModelInterface;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class ConstructCest
diff --git a/tests/database/Mvc/Model/CountCest.php b/tests/database/Mvc/Model/CountCest.php
index 2744debe99b..d1473bf3ba7 100644
--- a/tests/database/Mvc/Model/CountCest.php
+++ b/tests/database/Mvc/Model/CountCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesMap;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesMap;
 
 class CountCest
 {
diff --git a/tests/database/Mvc/Model/CreateCest.php b/tests/database/Mvc/Model/CreateCest.php
index 58f41bce571..633208f9d0e 100644
--- a/tests/database/Mvc/Model/CreateCest.php
+++ b/tests/database/Mvc/Model/CreateCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function date;
 use function uniqid;
diff --git a/tests/database/Mvc/Model/Criteria/AndWhereCest.php b/tests/database/Mvc/Model/Criteria/AndWhereCest.php
index 3d1bbec7aaf..0db07961ef6 100644
--- a/tests/database/Mvc/Model/Criteria/AndWhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/AndWhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class AndWhereCest
@@ -56,8 +56,8 @@ public function mvcModelCriteriaAndWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE (inv_cst_id = 1) '
             . 'AND (inv_status_flag = :status:)';
         $actual   = $builder->getPhql();
diff --git a/tests/database/Mvc/Model/Criteria/BetweenWhereCest.php b/tests/database/Mvc/Model/Criteria/BetweenWhereCest.php
index baa3d2566df..63b1c5829fc 100644
--- a/tests/database/Mvc/Model/Criteria/BetweenWhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/BetweenWhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class BetweenWhereCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaBetweenWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE inv_cst_id BETWEEN :ACP0: AND :ACP1:';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/BindCest.php b/tests/database/Mvc/Model/Criteria/BindCest.php
index 9e056ca2885..8a86e57d976 100644
--- a/tests/database/Mvc/Model/Criteria/BindCest.php
+++ b/tests/database/Mvc/Model/Criteria/BindCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class BindCest
diff --git a/tests/database/Mvc/Model/Criteria/BindTypesCest.php b/tests/database/Mvc/Model/Criteria/BindTypesCest.php
index 51f19c5b60a..3a7ad4dfb99 100644
--- a/tests/database/Mvc/Model/Criteria/BindTypesCest.php
+++ b/tests/database/Mvc/Model/Criteria/BindTypesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class BindTypesCest
diff --git a/tests/database/Mvc/Model/Criteria/CacheCest.php b/tests/database/Mvc/Model/Criteria/CacheCest.php
index 8e08fecfc09..0d080a23eaf 100644
--- a/tests/database/Mvc/Model/Criteria/CacheCest.php
+++ b/tests/database/Mvc/Model/Criteria/CacheCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class CacheCest
diff --git a/tests/database/Mvc/Model/Criteria/ColumnsCest.php b/tests/database/Mvc/Model/Criteria/ColumnsCest.php
index 482362e765a..efa4e2f9521 100644
--- a/tests/database/Mvc/Model/Criteria/ColumnsCest.php
+++ b/tests/database/Mvc/Model/Criteria/ColumnsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class ColumnsCest
@@ -56,7 +56,7 @@ public function mvcModelCriteriaColumns(DatabaseTester $I)
         $I->assertInstanceOf(Builder::class, $builder);
 
         $expected = 'SELECT inv_id, inv_total '
-            . 'FROM [Phalcon\Test\Models\Invoices]';
+            . 'FROM [Phalcon\Tests\Models\Invoices]';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
     }
@@ -91,7 +91,7 @@ public function mvcModelCriteriaColumnsArray(DatabaseTester $I)
         $I->assertInstanceOf(Builder::class, $builder);
 
         $expected = 'SELECT inv_id AS [id], inv_total AS [total] '
-            . 'FROM [Phalcon\Test\Models\Invoices]';
+            . 'FROM [Phalcon\Tests\Models\Invoices]';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
     }
diff --git a/tests/database/Mvc/Model/Criteria/DistinctCest.php b/tests/database/Mvc/Model/Criteria/DistinctCest.php
index ab50ebffae7..520a0488870 100644
--- a/tests/database/Mvc/Model/Criteria/DistinctCest.php
+++ b/tests/database/Mvc/Model/Criteria/DistinctCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
diff --git a/tests/database/Mvc/Model/Criteria/ExecuteCest.php b/tests/database/Mvc/Model/Criteria/ExecuteCest.php
index e431a1a77cb..30600358363 100644
--- a/tests/database/Mvc/Model/Criteria/ExecuteCest.php
+++ b/tests/database/Mvc/Model/Criteria/ExecuteCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/Criteria/ForUpdateCest.php b/tests/database/Mvc/Model/Criteria/ForUpdateCest.php
index 00d54747f18..79a33bf0d30 100644
--- a/tests/database/Mvc/Model/Criteria/ForUpdateCest.php
+++ b/tests/database/Mvc/Model/Criteria/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
diff --git a/tests/database/Mvc/Model/Criteria/FromInputCest.php b/tests/database/Mvc/Model/Criteria/FromInputCest.php
index 59179a5f70b..8776fa72c00 100644
--- a/tests/database/Mvc/Model/Criteria/FromInputCest.php
+++ b/tests/database/Mvc/Model/Criteria/FromInputCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class FromInputCest
 {
@@ -71,8 +71,8 @@ public function mvcModelCriteriaFromInputMysql(DatabaseTester $I)
         $builder  = $criteria->createBuilder();
 
         if ($I->getDriver() === 'sqlite') {
-            $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-                . 'FROM [Phalcon\Test\Models\Invoices] '
+            $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+                . 'FROM [Phalcon\Tests\Models\Invoices] '
                 . 'WHERE [inv_id] = :inv_id: '
                 . 'AND [inv_cst_id] = :inv_cst_id: '
                 . 'AND [inv_status_flag] = :inv_status_flag: '
@@ -80,8 +80,8 @@ public function mvcModelCriteriaFromInputMysql(DatabaseTester $I)
                 . 'AND [inv_total] LIKE :inv_total: '
                 . 'AND [inv_created_at] = :inv_created_at:';
         } else {
-            $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-                . 'FROM [Phalcon\Test\Models\Invoices] '
+            $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+                . 'FROM [Phalcon\Tests\Models\Invoices] '
                 . 'WHERE [inv_id] = :inv_id: '
                 . 'AND [inv_cst_id] = :inv_cst_id: '
                 . 'AND [inv_status_flag] = :inv_status_flag: '
diff --git a/tests/database/Mvc/Model/Criteria/GetColumnsCest.php b/tests/database/Mvc/Model/Criteria/GetColumnsCest.php
index c1313251f3a..b7dac0ddcc9 100644
--- a/tests/database/Mvc/Model/Criteria/GetColumnsCest.php
+++ b/tests/database/Mvc/Model/Criteria/GetColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
diff --git a/tests/database/Mvc/Model/Criteria/GetConditionsCest.php b/tests/database/Mvc/Model/Criteria/GetConditionsCest.php
index dbfdc793ac4..08e01ba1e34 100644
--- a/tests/database/Mvc/Model/Criteria/GetConditionsCest.php
+++ b/tests/database/Mvc/Model/Criteria/GetConditionsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetConditionsCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaGetConditions(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE inv_cst_id = 1';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/GetModelNameCest.php b/tests/database/Mvc/Model/Criteria/GetModelNameCest.php
index 5a9ab25071a..5fad99616e1 100644
--- a/tests/database/Mvc/Model/Criteria/GetModelNameCest.php
+++ b/tests/database/Mvc/Model/Criteria/GetModelNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetModelNameCest
diff --git a/tests/database/Mvc/Model/Criteria/GetSetDICest.php b/tests/database/Mvc/Model/Criteria/GetSetDICest.php
index 435c95ca411..396cf3bc4a6 100644
--- a/tests/database/Mvc/Model/Criteria/GetSetDICest.php
+++ b/tests/database/Mvc/Model/Criteria/GetSetDICest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetDICest
 {
diff --git a/tests/database/Mvc/Model/Criteria/GroupByCest.php b/tests/database/Mvc/Model/Criteria/GroupByCest.php
index 7f6563f12f3..de47805687f 100644
--- a/tests/database/Mvc/Model/Criteria/GroupByCest.php
+++ b/tests/database/Mvc/Model/Criteria/GroupByCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GroupByCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaGroupBy(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'GROUP BY [inv_cst_id]';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/HavingCest.php b/tests/database/Mvc/Model/Criteria/HavingCest.php
index c0503fe48cd..606cd07af96 100644
--- a/tests/database/Mvc/Model/Criteria/HavingCest.php
+++ b/tests/database/Mvc/Model/Criteria/HavingCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class HavingCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaHaving(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'HAVING inv_cst_id = 1';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/InWhereCest.php b/tests/database/Mvc/Model/Criteria/InWhereCest.php
index 99e595416cb..5ce5cc8ab5a 100644
--- a/tests/database/Mvc/Model/Criteria/InWhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/InWhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class InWhereCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaInWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE inv_cst_id IN (:ACP0:, :ACP1:)';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/InnerJoinCest.php b/tests/database/Mvc/Model/Criteria/InnerJoinCest.php
index a2d095d2b99..9d23a136053 100644
--- a/tests/database/Mvc/Model/Criteria/InnerJoinCest.php
+++ b/tests/database/Mvc/Model/Criteria/InnerJoinCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class InnerJoinCest
@@ -56,9 +56,9 @@ public function mvcModelCriteriaInnerJoin(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
-            . 'INNER JOIN [Phalcon\Test\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
+            . 'INNER JOIN [Phalcon\Tests\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
     }
diff --git a/tests/database/Mvc/Model/Criteria/JoinCest.php b/tests/database/Mvc/Model/Criteria/JoinCest.php
index 560fd72d502..651bcb7f4b8 100644
--- a/tests/database/Mvc/Model/Criteria/JoinCest.php
+++ b/tests/database/Mvc/Model/Criteria/JoinCest.php
@@ -11,18 +11,18 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\Orders;
-use Phalcon\Test\Models\Products;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\Orders;
+use Phalcon\Tests\Models\Products;
 
 /**
  * Class JoinCest
@@ -65,9 +65,9 @@ public function mvcModelCriteriaJoin(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
-            . 'JOIN [Phalcon\Test\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
+            . 'JOIN [Phalcon\Tests\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
     }
diff --git a/tests/database/Mvc/Model/Criteria/LeftJoinCest.php b/tests/database/Mvc/Model/Criteria/LeftJoinCest.php
index 612de55f423..5ad1afb0d9c 100644
--- a/tests/database/Mvc/Model/Criteria/LeftJoinCest.php
+++ b/tests/database/Mvc/Model/Criteria/LeftJoinCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class LeftJoinCest
@@ -56,9 +56,9 @@ public function mvcModelCriteriaLeftJoin(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
-            . 'LEFT JOIN [Phalcon\Test\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
+            . 'LEFT JOIN [Phalcon\Tests\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
     }
diff --git a/tests/database/Mvc/Model/Criteria/LimitCest.php b/tests/database/Mvc/Model/Criteria/LimitCest.php
index c0b6a327131..581f85a5e84 100644
--- a/tests/database/Mvc/Model/Criteria/LimitCest.php
+++ b/tests/database/Mvc/Model/Criteria/LimitCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class LimitCest
 {
@@ -61,8 +61,8 @@ public function mvcModelCriteriaNoLimit(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices]';
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices]';
 
         $I->assertEquals($expected, $builder->getPhql());
         $I->assertEquals(null, $criteria->getLimit());
@@ -94,8 +94,8 @@ public function mvcModelCriteriaLimit(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'LIMIT :APL0:';
 
         $I->assertEquals($expected, $builder->getPhql());
@@ -128,8 +128,8 @@ public function mvcModelCriteriaLimitOffset(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'LIMIT :APL0: OFFSET :APL1:';
 
         $I->assertEquals($expected, $builder->getPhql());
diff --git a/tests/database/Mvc/Model/Criteria/NotBetweenWhereCest.php b/tests/database/Mvc/Model/Criteria/NotBetweenWhereCest.php
index 32630af7fb9..1ca7a1f0675 100644
--- a/tests/database/Mvc/Model/Criteria/NotBetweenWhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/NotBetweenWhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class NotBetweenWhereCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaNotBetweenWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE inv_cst_id NOT BETWEEN :ACP0: AND :ACP1:';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/NotInWhereCest.php b/tests/database/Mvc/Model/Criteria/NotInWhereCest.php
index 5d18bb43a07..9042ceff1a6 100644
--- a/tests/database/Mvc/Model/Criteria/NotInWhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/NotInWhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class NotInWhereCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaNotInWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE inv_cst_id NOT IN (:ACP0:, :ACP1:)';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/OrWhereCest.php b/tests/database/Mvc/Model/Criteria/OrWhereCest.php
index 870dc5f874e..6af5787421a 100644
--- a/tests/database/Mvc/Model/Criteria/OrWhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/OrWhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class OrWhereCest
@@ -56,8 +56,8 @@ public function mvcModelCriteriaOrWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE (inv_cst_id = 1) OR (inv_status_flag = :status:)';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/OrderByCest.php b/tests/database/Mvc/Model/Criteria/OrderByCest.php
index ae4f1c83855..ce06642ad91 100644
--- a/tests/database/Mvc/Model/Criteria/OrderByCest.php
+++ b/tests/database/Mvc/Model/Criteria/OrderByCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class OrderByCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaOrderBy(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'ORDER BY inv_cst_id DESC';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Criteria/RightJoinCest.php b/tests/database/Mvc/Model/Criteria/RightJoinCest.php
index 72847ef218e..f6fefe12fef 100644
--- a/tests/database/Mvc/Model/Criteria/RightJoinCest.php
+++ b/tests/database/Mvc/Model/Criteria/RightJoinCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class RightJoinCest
@@ -56,9 +56,9 @@ public function mvcModelCriteriaRightJoin(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
-            . 'RIGHT JOIN [Phalcon\Test\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
+            . 'RIGHT JOIN [Phalcon\Tests\Models\Customers] AS [customer] ON inv_cst_id = cst_id';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
     }
diff --git a/tests/database/Mvc/Model/Criteria/SharedLockCest.php b/tests/database/Mvc/Model/Criteria/SharedLockCest.php
index 129d3589a86..85055399559 100644
--- a/tests/database/Mvc/Model/Criteria/SharedLockCest.php
+++ b/tests/database/Mvc/Model/Criteria/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
diff --git a/tests/database/Mvc/Model/Criteria/WhereCest.php b/tests/database/Mvc/Model/Criteria/WhereCest.php
index 1fad2928c69..a3175ea705f 100644
--- a/tests/database/Mvc/Model/Criteria/WhereCest.php
+++ b/tests/database/Mvc/Model/Criteria/WhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Criteria;
+namespace Phalcon\Tests\Database\Mvc\Model\Criteria;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class WhereCest
@@ -55,8 +55,8 @@ public function mvcModelCriteriaWhere(DatabaseTester $I)
 
         $I->assertInstanceOf(Builder::class, $builder);
 
-        $expected = 'SELECT [Phalcon\Test\Models\Invoices].* '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+        $expected = 'SELECT [Phalcon\Tests\Models\Invoices].* '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'WHERE inv_cst_id = 1';
         $actual   = $builder->getPhql();
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/DeleteCest.php b/tests/database/Mvc/Model/DeleteCest.php
index 64af7ba9afd..a4f7c445641 100644
--- a/tests/database/Mvc/Model/DeleteCest.php
+++ b/tests/database/Mvc/Model/DeleteCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
 use Phalcon\Mvc\Model\Transaction\Manager;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
 
 use function date;
 use function uniqid;
diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php
index ec67482c096..b5aea285af9 100644
--- a/tests/database/Mvc/Model/FindCest.php
+++ b/tests/database/Mvc/Model/FindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
@@ -19,14 +19,14 @@
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Migrations\AbstractMigration;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Migrations\ObjectsMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\Objects;
+use Phalcon\Tests\Fixtures\Migrations\AbstractMigration;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\ObjectsMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\Objects;
 
 use function getOptionsRedis;
 use function outputDir;
diff --git a/tests/database/Mvc/Model/FindFirstCest.php b/tests/database/Mvc/Model/FindFirstCest.php
index 1f24006d66c..90299143554 100644
--- a/tests/database/Mvc/Model/FindFirstCest.php
+++ b/tests/database/Mvc/Model/FindFirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use Codeception\Example;
 use DatabaseTester;
@@ -19,13 +19,13 @@
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Row;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Migrations\StringPrimaryMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesExtended;
-use Phalcon\Test\Models\InvoicesMap;
-use Phalcon\Test\Models\ModelWithStringPrimary;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\StringPrimaryMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesExtended;
+use Phalcon\Tests\Models\InvoicesMap;
+use Phalcon\Tests\Models\ModelWithStringPrimary;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/GetMessagesCest.php b/tests/database/Mvc/Model/GetMessagesCest.php
index 1b255a6403b..c210683fdfe 100644
--- a/tests/database/Mvc/Model/GetMessagesCest.php
+++ b/tests/database/Mvc/Model/GetMessagesCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\ObjectsMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Objects;
+use Phalcon\Tests\Fixtures\Migrations\ObjectsMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Objects;
 
 /**
  * Class GetMessagesCest
diff --git a/tests/database/Mvc/Model/GetReadConnectionCest.php b/tests/database/Mvc/Model/GetReadConnectionCest.php
index 98a38173d29..9586dc490d6 100644
--- a/tests/database/Mvc/Model/GetReadConnectionCest.php
+++ b/tests/database/Mvc/Model/GetReadConnectionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetReadConnectionCest
diff --git a/tests/database/Mvc/Model/GetRelatedCest.php b/tests/database/Mvc/Model/GetRelatedCest.php
index e2fc6c25b01..065639029ee 100644
--- a/tests/database/Mvc/Model/GetRelatedCest.php
+++ b/tests/database/Mvc/Model/GetRelatedCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/GetSetEventsManagerCest.php b/tests/database/Mvc/Model/GetSetEventsManagerCest.php
index 7187a610f91..1a5a9bef7bf 100644
--- a/tests/database/Mvc/Model/GetSetEventsManagerCest.php
+++ b/tests/database/Mvc/Model/GetSetEventsManagerCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Events\Manager;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/GetSetReadConnectionServiceCest.php b/tests/database/Mvc/Model/GetSetReadConnectionServiceCest.php
index fa03c449fb8..0e5dcb542df 100644
--- a/tests/database/Mvc/Model/GetSetReadConnectionServiceCest.php
+++ b/tests/database/Mvc/Model/GetSetReadConnectionServiceCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetSetReadConnectionServiceCest
diff --git a/tests/database/Mvc/Model/GetSetWriteConnectionServiceCest.php b/tests/database/Mvc/Model/GetSetWriteConnectionServiceCest.php
index 1ab2a3ca51d..ffe1138840e 100644
--- a/tests/database/Mvc/Model/GetSetWriteConnectionServiceCest.php
+++ b/tests/database/Mvc/Model/GetSetWriteConnectionServiceCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetSetWriteConnectionServiceCest
diff --git a/tests/database/Mvc/Model/GetWriteConnectionCest.php b/tests/database/Mvc/Model/GetWriteConnectionCest.php
index d430e3ac712..3e434e55927 100644
--- a/tests/database/Mvc/Model/GetWriteConnectionCest.php
+++ b/tests/database/Mvc/Model/GetWriteConnectionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetWriteConnectionCest
diff --git a/tests/database/Mvc/Model/HasChangedCest.php b/tests/database/Mvc/Model/HasChangedCest.php
index 7ffc92f9daa..6d938250947 100644
--- a/tests/database/Mvc/Model/HasChangedCest.php
+++ b/tests/database/Mvc/Model/HasChangedCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\CustomersDefaults;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\CustomersDefaults;
 
 class HasChangedCest
 {
diff --git a/tests/database/Mvc/Model/Manager/ExecuteQueryCest.php b/tests/database/Mvc/Model/Manager/ExecuteQueryCest.php
index 7608256590f..c10c072fd5a 100644
--- a/tests/database/Mvc/Model/Manager/ExecuteQueryCest.php
+++ b/tests/database/Mvc/Model/Manager/ExecuteQueryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Manager;
+namespace Phalcon\Tests\Database\Mvc\Model\Manager;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\ManagerInterface;
@@ -19,8 +19,8 @@
 use Phalcon\Mvc\Model\Resultset\Complex;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class ExecuteQueryCest
 {
diff --git a/tests/database/Mvc/Model/MaximumCest.php b/tests/database/Mvc/Model/MaximumCest.php
index 006ba407b60..c5ecca30641 100644
--- a/tests/database/Mvc/Model/MaximumCest.php
+++ b/tests/database/Mvc/Model/MaximumCest.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class MaximumCest
 {
diff --git a/tests/database/Mvc/Model/MetaData/GetAttributesCest.php b/tests/database/Mvc/Model/MetaData/GetAttributesCest.php
index 00592f8dd54..3cab1d38bef 100644
--- a/tests/database/Mvc/Model/MetaData/GetAttributesCest.php
+++ b/tests/database/Mvc/Model/MetaData/GetAttributesCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetAttributesCest
diff --git a/tests/database/Mvc/Model/MetaData/GetColumnMapCest.php b/tests/database/Mvc/Model/MetaData/GetColumnMapCest.php
index d910333baf9..06edf3bff42 100644
--- a/tests/database/Mvc/Model/MetaData/GetColumnMapCest.php
+++ b/tests/database/Mvc/Model/MetaData/GetColumnMapCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesMap;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesMap;
 
 /**
  * Class GetColumnMapCest
diff --git a/tests/database/Mvc/Model/MetaData/GetDataTypesCest.php b/tests/database/Mvc/Model/MetaData/GetDataTypesCest.php
index afafe36f7d0..d837b7c77cb 100644
--- a/tests/database/Mvc/Model/MetaData/GetDataTypesCest.php
+++ b/tests/database/Mvc/Model/MetaData/GetDataTypesCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetDataTypesCest
diff --git a/tests/database/Mvc/Model/MetaData/GetIdentityFieldCest.php b/tests/database/Mvc/Model/MetaData/GetIdentityFieldCest.php
index 0728e3558a7..b6a2fc00c53 100644
--- a/tests/database/Mvc/Model/MetaData/GetIdentityFieldCest.php
+++ b/tests/database/Mvc/Model/MetaData/GetIdentityFieldCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetIdentityFieldCest
diff --git a/tests/database/Mvc/Model/MetaData/GetNonPrimaryKeyAttributesCest.php b/tests/database/Mvc/Model/MetaData/GetNonPrimaryKeyAttributesCest.php
index 231ed37fe21..41dc846e050 100644
--- a/tests/database/Mvc/Model/MetaData/GetNonPrimaryKeyAttributesCest.php
+++ b/tests/database/Mvc/Model/MetaData/GetNonPrimaryKeyAttributesCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetNonPrimaryKeyAttributesCest
diff --git a/tests/database/Mvc/Model/MetaData/GetNotNullAttributesCest.php b/tests/database/Mvc/Model/MetaData/GetNotNullAttributesCest.php
index b83fd8c3764..f7a682fc5b1 100644
--- a/tests/database/Mvc/Model/MetaData/GetNotNullAttributesCest.php
+++ b/tests/database/Mvc/Model/MetaData/GetNotNullAttributesCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class GetNotNullAttributesCest
diff --git a/tests/database/Mvc/Model/MetaData/GetSetDICest.php b/tests/database/Mvc/Model/MetaData/GetSetDICest.php
index ad51469cd2f..9d5ea4351b6 100644
--- a/tests/database/Mvc/Model/MetaData/GetSetDICest.php
+++ b/tests/database/Mvc/Model/MetaData/GetSetDICest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Exception as ExpectedException;
 use Phalcon\Mvc\Model\MetaData\Memory;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetDICest
 {
diff --git a/tests/database/Mvc/Model/MetaData/HasAttributeCest.php b/tests/database/Mvc/Model/MetaData/HasAttributeCest.php
index 7826ee63d18..0b6e0582872 100644
--- a/tests/database/Mvc/Model/MetaData/HasAttributeCest.php
+++ b/tests/database/Mvc/Model/MetaData/HasAttributeCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Database\Mvc\Model\MetaData;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class HasAttributeCest
diff --git a/tests/database/Mvc/Model/MinimumCest.php b/tests/database/Mvc/Model/MinimumCest.php
index 27aaf1ff048..5abed6349a7 100644
--- a/tests/database/Mvc/Model/MinimumCest.php
+++ b/tests/database/Mvc/Model/MinimumCest.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class MinimumCest
 {
diff --git a/tests/database/Mvc/Model/Query/Builder/OrderByCest.php b/tests/database/Mvc/Model/Query/Builder/OrderByCest.php
index f233af67f50..361766e5c5a 100644
--- a/tests/database/Mvc/Model/Query/Builder/OrderByCest.php
+++ b/tests/database/Mvc/Model/Query/Builder/OrderByCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Database\Mvc\Model\Query\Builder;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class OrderByCest
 {
@@ -69,7 +69,7 @@ public function mvcModelQueryBuilderOrderBy(DatabaseTester $I)
         ;
 
         $expected = 'SELECT inv_id, inv_title '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'ORDER BY inv_title';
         $actual   = $phql;
         $I->assertEquals($expected, $actual);
@@ -80,7 +80,7 @@ public function mvcModelQueryBuilderOrderBy(DatabaseTester $I)
         ;
 
         $expected = 'SELECT inv_id, inv_title '
-            . 'FROM [Phalcon\Test\Models\Invoices] '
+            . 'FROM [Phalcon\Tests\Models\Invoices] '
             . 'ORDER BY inv_title DESC';
         $actual   = $phql;
         $I->assertEquals($expected, $actual);
diff --git a/tests/database/Mvc/Model/Query/CacheCest.php b/tests/database/Mvc/Model/Query/CacheCest.php
index 522da86c4c0..02fc6740e4f 100644
--- a/tests/database/Mvc/Model/Query/CacheCest.php
+++ b/tests/database/Mvc/Model/Query/CacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Query;
+namespace Phalcon\Tests\Database\Mvc\Model\Query;
 
 use Codeception\Example;
 use DatabaseTester;
@@ -19,10 +19,10 @@
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Mvc\Model;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Migrations\AbstractMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\AbstractMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function cacheDir;
 
diff --git a/tests/database/Mvc/Model/Query/GetSqlCest.php b/tests/database/Mvc/Model/Query/GetSqlCest.php
index 86f20a404fb..88f1f80ff16 100644
--- a/tests/database/Mvc/Model/Query/GetSqlCest.php
+++ b/tests/database/Mvc/Model/Query/GetSqlCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Query;
+namespace Phalcon\Tests\Database\Mvc\Model\Query;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Query;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class GetSqlCest
 {
diff --git a/tests/database/Mvc/Model/QueryCest.php b/tests/database/Mvc/Model/QueryCest.php
index d270acf434c..4e07f2d377f 100644
--- a/tests/database/Mvc/Model/QueryCest.php
+++ b/tests/database/Mvc/Model/QueryCest.php
@@ -11,20 +11,20 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Complex;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Mvc\Model\Row;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Customers;
-use Phalcon\Test\Models\CustomersKeepSnapshots;
-use Phalcon\Test\Models\InvoicesKeepSnapshots;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Customers;
+use Phalcon\Tests\Models\CustomersKeepSnapshots;
+use Phalcon\Tests\Models\InvoicesKeepSnapshots;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/ReadWriteAttributeCest.php b/tests/database/Mvc/Model/ReadWriteAttributeCest.php
index 2d92c94ab0e..fefed836937 100644
--- a/tests/database/Mvc/Model/ReadWriteAttributeCest.php
+++ b/tests/database/Mvc/Model/ReadWriteAttributeCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/RefreshCest.php b/tests/database/Mvc/Model/RefreshCest.php
index 6467b7220a9..e00e810aa65 100644
--- a/tests/database/Mvc/Model/RefreshCest.php
+++ b/tests/database/Mvc/Model/RefreshCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/Resultset/Complex/UnserializeCest.php b/tests/database/Mvc/Model/Resultset/Complex/UnserializeCest.php
index 0a8301089eb..7128cdf4539 100644
--- a/tests/database/Mvc/Model/Resultset/Complex/UnserializeCest.php
+++ b/tests/database/Mvc/Model/Resultset/Complex/UnserializeCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Database\Mvc\Model\Resultset\Complex;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Complex;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
 
 class UnserializeCest
 {
diff --git a/tests/database/Mvc/Model/Resultset/GetFirstCest.php b/tests/database/Mvc/Model/Resultset/GetFirstCest.php
index 5c820732033..742cadca608 100644
--- a/tests/database/Mvc/Model/Resultset/GetFirstCest.php
+++ b/tests/database/Mvc/Model/Resultset/GetFirstCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Database\Mvc\Model\Resultset;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\ManagerInterface;
 use Phalcon\Mvc\Model\Row;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class GetFirstCest
 {
diff --git a/tests/database/Mvc/Model/Resultset/Simple/UnserializeCest.php b/tests/database/Mvc/Model/Resultset/Simple/UnserializeCest.php
index cba57809ac9..31f7f8c3378 100644
--- a/tests/database/Mvc/Model/Resultset/Simple/UnserializeCest.php
+++ b/tests/database/Mvc/Model/Resultset/Simple/UnserializeCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Database\Mvc\Model\Resultset\Simple;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
 
 class UnserializeCest
 {
diff --git a/tests/database/Mvc/Model/Row/JsonSerializeCest.php b/tests/database/Mvc/Model/Row/JsonSerializeCest.php
index d9961935e9d..b64aaa9fac4 100644
--- a/tests/database/Mvc/Model/Row/JsonSerializeCest.php
+++ b/tests/database/Mvc/Model/Row/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Row;
diff --git a/tests/database/Mvc/Model/Row/OffsetExistsCest.php b/tests/database/Mvc/Model/Row/OffsetExistsCest.php
index 719871bacdd..24d791015dd 100644
--- a/tests/database/Mvc/Model/Row/OffsetExistsCest.php
+++ b/tests/database/Mvc/Model/Row/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Row;
diff --git a/tests/database/Mvc/Model/Row/OffsetGetCest.php b/tests/database/Mvc/Model/Row/OffsetGetCest.php
index baa57af8c84..eb04d5ebc2e 100644
--- a/tests/database/Mvc/Model/Row/OffsetGetCest.php
+++ b/tests/database/Mvc/Model/Row/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Row;
diff --git a/tests/database/Mvc/Model/Row/OffsetSetCest.php b/tests/database/Mvc/Model/Row/OffsetSetCest.php
index 5f003d8bdc6..7d87f640cc4 100644
--- a/tests/database/Mvc/Model/Row/OffsetSetCest.php
+++ b/tests/database/Mvc/Model/Row/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Exception;
diff --git a/tests/database/Mvc/Model/Row/OffsetUnsetCest.php b/tests/database/Mvc/Model/Row/OffsetUnsetCest.php
index 1967800f0c1..306b4d83ca7 100644
--- a/tests/database/Mvc/Model/Row/OffsetUnsetCest.php
+++ b/tests/database/Mvc/Model/Row/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Exception;
diff --git a/tests/database/Mvc/Model/Row/ReadWriteAttributeCest.php b/tests/database/Mvc/Model/Row/ReadWriteAttributeCest.php
index 73ecc766c3c..58892640102 100644
--- a/tests/database/Mvc/Model/Row/ReadWriteAttributeCest.php
+++ b/tests/database/Mvc/Model/Row/ReadWriteAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Row;
diff --git a/tests/database/Mvc/Model/Row/SetDirtyStateCest.php b/tests/database/Mvc/Model/Row/SetDirtyStateCest.php
index f191855e90e..9c3ddf28f6c 100644
--- a/tests/database/Mvc/Model/Row/SetDirtyStateCest.php
+++ b/tests/database/Mvc/Model/Row/SetDirtyStateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Row;
diff --git a/tests/database/Mvc/Model/Row/ToArrayCest.php b/tests/database/Mvc/Model/Row/ToArrayCest.php
index 606181cf55d..a7120695bc6 100644
--- a/tests/database/Mvc/Model/Row/ToArrayCest.php
+++ b/tests/database/Mvc/Model/Row/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model\Row;
+namespace Phalcon\Tests\Database\Mvc\Model\Row;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Row;
diff --git a/tests/database/Mvc/Model/SaveCest.php b/tests/database/Mvc/Model/SaveCest.php
index 36f4ea83485..151a91c5916 100644
--- a/tests/database/Mvc/Model/SaveCest.php
+++ b/tests/database/Mvc/Model/SaveCest.php
@@ -11,24 +11,24 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Test\Fixtures\Migrations\CustomersDefaultsMigration;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Migrations\SourcesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\CustomersDefaults;
-use Phalcon\Test\Models\CustomersKeepSnapshots;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesKeepSnapshots;
-use Phalcon\Test\Models\InvoicesSchema;
-use Phalcon\Test\Models\InvoicesValidationFails;
-use Phalcon\Test\Models\Sources;
-use Phalcon\Test\Models\Customers;
+use Phalcon\Tests\Fixtures\Migrations\CustomersDefaultsMigration;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\SourcesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\CustomersDefaults;
+use Phalcon\Tests\Models\CustomersKeepSnapshots;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesKeepSnapshots;
+use Phalcon\Tests\Models\InvoicesSchema;
+use Phalcon\Tests\Models\InvoicesValidationFails;
+use Phalcon\Tests\Models\Sources;
+use Phalcon\Tests\Models\Customers;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/SerializeCest.php b/tests/database/Mvc/Model/SerializeCest.php
index c7bae713698..f67b761178b 100644
--- a/tests/database/Mvc/Model/SerializeCest.php
+++ b/tests/database/Mvc/Model/SerializeCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function date;
 use function serialize;
diff --git a/tests/database/Mvc/Model/SumCest.php b/tests/database/Mvc/Model/SumCest.php
index 3fe7421c178..96430501562 100644
--- a/tests/database/Mvc/Model/SumCest.php
+++ b/tests/database/Mvc/Model/SumCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Mvc\Model\Transaction\Manager;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class SumCest
 {
diff --git a/tests/database/Mvc/Model/ToArrayCest.php b/tests/database/Mvc/Model/ToArrayCest.php
index db3e360082e..e90935db517 100644
--- a/tests/database/Mvc/Model/ToArrayCest.php
+++ b/tests/database/Mvc/Model/ToArrayCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesMap;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesMap;
 
 use function uniqid;
 
diff --git a/tests/database/Mvc/Model/UnderscoreCallCest.php b/tests/database/Mvc/Model/UnderscoreCallCest.php
index b81f004c6ef..2ae8a2068a3 100644
--- a/tests/database/Mvc/Model/UnderscoreCallCest.php
+++ b/tests/database/Mvc/Model/UnderscoreCallCest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models;
 
 class UnderscoreCallCest
 {
diff --git a/tests/database/Mvc/Model/UnderscoreCallStaticCest.php b/tests/database/Mvc/Model/UnderscoreCallStaticCest.php
index cd6751c7593..8388c771a15 100644
--- a/tests/database/Mvc/Model/UnderscoreCallStaticCest.php
+++ b/tests/database/Mvc/Model/UnderscoreCallStaticCest.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Resultset;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models;
 
 class UnderscoreCallStaticCest
 {
diff --git a/tests/database/Mvc/Model/UnderscoreGetCest.php b/tests/database/Mvc/Model/UnderscoreGetCest.php
index 093a8642cb0..5817894be0d 100644
--- a/tests/database/Mvc/Model/UnderscoreGetCest.php
+++ b/tests/database/Mvc/Model/UnderscoreGetCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models;
+use Phalcon\Tests\Models\Invoices;
 
 class UnderscoreGetCest
 {
diff --git a/tests/database/Mvc/Model/UnderscoreIssetCest.php b/tests/database/Mvc/Model/UnderscoreIssetCest.php
index 204bc5c6c5a..3db59565b99 100644
--- a/tests/database/Mvc/Model/UnderscoreIssetCest.php
+++ b/tests/database/Mvc/Model/UnderscoreIssetCest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models;
 
 class UnderscoreIssetCest
 {
diff --git a/tests/database/Mvc/Model/UnderscoreSetCest.php b/tests/database/Mvc/Model/UnderscoreSetCest.php
index 6775c3b4d18..b94b87c0c38 100644
--- a/tests/database/Mvc/Model/UnderscoreSetCest.php
+++ b/tests/database/Mvc/Model/UnderscoreSetCest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model;
-use Phalcon\Test\Fixtures\Migrations\CustomersMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models;
+use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models;
 
 class UnderscoreSetCest
 {
diff --git a/tests/database/Mvc/Model/UnserializeCest.php b/tests/database/Mvc/Model/UnserializeCest.php
index 347077ae024..89527add0d5 100644
--- a/tests/database/Mvc/Model/UnserializeCest.php
+++ b/tests/database/Mvc/Model/UnserializeCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function date;
 use function uniqid;
diff --git a/tests/database/Mvc/Model/UpdateCest.php b/tests/database/Mvc/Model/UpdateCest.php
index ae4a3d1b4b1..8a946830254 100644
--- a/tests/database/Mvc/Model/UpdateCest.php
+++ b/tests/database/Mvc/Model/UpdateCest.php
@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
 
 use DatabaseTester;
 use Phalcon\Mvc\ModelInterface;
-use Phalcon\Test\Fixtures\Migrations\CustomersDefaultsMigration;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Migrations\SettersMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\CustomersDefaults;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\Setters;
+use Phalcon\Tests\Fixtures\Migrations\CustomersDefaultsMigration;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Migrations\SettersMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\CustomersDefaults;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\Setters;
 
 use function uniqid;
 
diff --git a/tests/database/Paginator/Adapter/Model/ConstructCest.php b/tests/database/Paginator/Adapter/Model/ConstructCest.php
index c78d65d6902..3f1948c39af 100644
--- a/tests/database/Paginator/Adapter/Model/ConstructCest.php
+++ b/tests/database/Paginator/Adapter/Model/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\Model;
+namespace Phalcon\Tests\Database\Paginator\Adapter\Model;
 
 use DatabaseTester;
 use Phalcon\Paginator\Adapter\Model;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function uniqid;
 
diff --git a/tests/database/Paginator/Adapter/Model/PaginateCest.php b/tests/database/Paginator/Adapter/Model/PaginateCest.php
index 26e5baf859b..cd8898c01e1 100644
--- a/tests/database/Paginator/Adapter/Model/PaginateCest.php
+++ b/tests/database/Paginator/Adapter/Model/PaginateCest.php
@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\Model;
+namespace Phalcon\Tests\Database\Paginator\Adapter\Model;
 
 use DatabaseTester;
 use PDO;
 use Phalcon\Paginator\Adapter\Model;
 use Phalcon\Paginator\Repository;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class PaginateCest
 {
diff --git a/tests/database/Paginator/Adapter/Model/SetGetLimitCest.php b/tests/database/Paginator/Adapter/Model/SetGetLimitCest.php
index 0cc143a4181..9d2150e4877 100644
--- a/tests/database/Paginator/Adapter/Model/SetGetLimitCest.php
+++ b/tests/database/Paginator/Adapter/Model/SetGetLimitCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\Model;
+namespace Phalcon\Tests\Database\Paginator\Adapter\Model;
 
 use DatabaseTester;
 use Phalcon\Paginator\Adapter\Model;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 /**
  * Class SetGetLimitCest
diff --git a/tests/database/Paginator/Adapter/QueryBuilder/ConstructCest.php b/tests/database/Paginator/Adapter/QueryBuilder/ConstructCest.php
index 7265915b138..d2567aaa28a 100644
--- a/tests/database/Paginator/Adapter/QueryBuilder/ConstructCest.php
+++ b/tests/database/Paginator/Adapter/QueryBuilder/ConstructCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\QueryBuilder;
+namespace Phalcon\Tests\Database\Paginator\Adapter\QueryBuilder;
 
 use DatabaseTester;
 use Phalcon\Paginator\Adapter\AdapterInterface;
 use Phalcon\Paginator\Adapter\QueryBuilder;
 use Phalcon\Paginator\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
 use stdClass;
 
 /**
diff --git a/tests/database/Paginator/Adapter/QueryBuilder/GetSetLimitCest.php b/tests/database/Paginator/Adapter/QueryBuilder/GetSetLimitCest.php
index 73a5de0e951..e137c4b599a 100644
--- a/tests/database/Paginator/Adapter/QueryBuilder/GetSetLimitCest.php
+++ b/tests/database/Paginator/Adapter/QueryBuilder/GetSetLimitCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\QueryBuilder;
+namespace Phalcon\Tests\Database\Paginator\Adapter\QueryBuilder;
 
 use DatabaseTester;
 use Phalcon\Paginator\Adapter\QueryBuilder;
 use Phalcon\Paginator\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class GetSetLimitCest
 {
diff --git a/tests/database/Paginator/Adapter/QueryBuilder/GetSetQueryBuilderCest.php b/tests/database/Paginator/Adapter/QueryBuilder/GetSetQueryBuilderCest.php
index ec1a4de4de3..eedb4b24e4e 100644
--- a/tests/database/Paginator/Adapter/QueryBuilder/GetSetQueryBuilderCest.php
+++ b/tests/database/Paginator/Adapter/QueryBuilder/GetSetQueryBuilderCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\QueryBuilder;
+namespace Phalcon\Tests\Database\Paginator\Adapter\QueryBuilder;
 
 use DatabaseTester;
 use Phalcon\Paginator\Adapter\QueryBuilder;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 class GetSetQueryBuilderCest
 {
diff --git a/tests/database/Paginator/Adapter/QueryBuilder/PaginateCest.php b/tests/database/Paginator/Adapter/QueryBuilder/PaginateCest.php
index 76698641f73..5f8dcaaf4a4 100644
--- a/tests/database/Paginator/Adapter/QueryBuilder/PaginateCest.php
+++ b/tests/database/Paginator/Adapter/QueryBuilder/PaginateCest.php
@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Paginator\Adapter\QueryBuilder;
+namespace Phalcon\Tests\Database\Paginator\Adapter\QueryBuilder;
 
 use DatabaseTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Paginator\Adapter\QueryBuilder;
 use Phalcon\Paginator\Repository;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RecordsTrait;
-use Phalcon\Test\Models\Invoices;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RecordsTrait;
+use Phalcon\Tests\Models\Invoices;
 
 use function is_int;
 
diff --git a/tests/database/Validation/Validator/UniquenessCest.php b/tests/database/Validation/Validator/UniquenessCest.php
index a40419b90d5..e1b8ffab856 100644
--- a/tests/database/Validation/Validator/UniquenessCest.php
+++ b/tests/database/Validation/Validator/UniquenessCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Database\Validation\Validator;
+namespace Phalcon\Tests\Database\Validation\Validator;
 
 use DatabaseTester;
 use PDO;
-use Phalcon\Test\Fixtures\Migrations\ObjectsMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Objects;
-use Phalcon\Test\Models\ObjectsWithColumnMap;
+use Phalcon\Tests\Fixtures\Migrations\ObjectsMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Objects;
+use Phalcon\Tests\Models\ObjectsWithColumnMap;
 use Phalcon\Validation;
 use Phalcon\Validation\Validator\Uniqueness;
 
diff --git a/tests/integration/Cache/Adapter/Apcu/DecrementCest.php b/tests/integration/Cache/Adapter/Apcu/DecrementCest.php
index 14fcf137687..94b4de05651 100644
--- a/tests/integration/Cache/Adapter/Apcu/DecrementCest.php
+++ b/tests/integration/Cache/Adapter/Apcu/DecrementCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Apcu;
 
 use Exception;
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 
 class DecrementCest
 {
diff --git a/tests/integration/Cache/Adapter/Apcu/GetKeysCest.php b/tests/integration/Cache/Adapter/Apcu/GetKeysCest.php
index 56648fb187d..2a70238b8cc 100644
--- a/tests/integration/Cache/Adapter/Apcu/GetKeysCest.php
+++ b/tests/integration/Cache/Adapter/Apcu/GetKeysCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Apcu;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 
 class GetKeysCest
 {
diff --git a/tests/integration/Cache/Adapter/Apcu/GetSetCest.php b/tests/integration/Cache/Adapter/Apcu/GetSetCest.php
index 7aeede158c2..517f1d4c50f 100644
--- a/tests/integration/Cache/Adapter/Apcu/GetSetCest.php
+++ b/tests/integration/Cache/Adapter/Apcu/GetSetCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Apcu;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Cache\CacheFixtureData;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Cache\CacheFixtureData;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 
 class GetSetCest
 {
diff --git a/tests/integration/Cache/Adapter/Apcu/IncrementCest.php b/tests/integration/Cache/Adapter/Apcu/IncrementCest.php
index 658d4b6d825..0089caf6920 100644
--- a/tests/integration/Cache/Adapter/Apcu/IncrementCest.php
+++ b/tests/integration/Cache/Adapter/Apcu/IncrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Apcu;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 
 class IncrementCest
 {
diff --git a/tests/integration/Cache/Adapter/ClearCest.php b/tests/integration/Cache/Adapter/ClearCest.php
index e734a5c5804..d12f0754fce 100644
--- a/tests/integration/Cache/Adapter/ClearCest.php
+++ b/tests/integration/Cache/Adapter/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/ConstructCest.php b/tests/integration/Cache/Adapter/ConstructCest.php
index 6d7a0968af5..15effbc01f6 100644
--- a/tests/integration/Cache/Adapter/ConstructCest.php
+++ b/tests/integration/Cache/Adapter/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/DeleteCest.php b/tests/integration/Cache/Adapter/DeleteCest.php
index dcef6a806b8..a66f746c328 100644
--- a/tests/integration/Cache/Adapter/DeleteCest.php
+++ b/tests/integration/Cache/Adapter/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/GetAdapterCest.php b/tests/integration/Cache/Adapter/GetAdapterCest.php
index eb57f35f621..a51aabce68f 100644
--- a/tests/integration/Cache/Adapter/GetAdapterCest.php
+++ b/tests/integration/Cache/Adapter/GetAdapterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/GetPrefixCest.php b/tests/integration/Cache/Adapter/GetPrefixCest.php
index 81e37dc8b72..8d049ce0741 100644
--- a/tests/integration/Cache/Adapter/GetPrefixCest.php
+++ b/tests/integration/Cache/Adapter/GetPrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php b/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php
index d4037ee94a3..e1108d201dd 100644
--- a/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php
+++ b/tests/integration/Cache/Adapter/GetSetDefaultSerializerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/HasCest.php b/tests/integration/Cache/Adapter/HasCest.php
index 0d085f0526b..b24ce09ea8e 100644
--- a/tests/integration/Cache/Adapter/HasCest.php
+++ b/tests/integration/Cache/Adapter/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter;
+namespace Phalcon\Tests\Integration\Cache\Adapter;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Cache/Adapter/Libmemcached/DecrementCest.php b/tests/integration/Cache/Adapter/Libmemcached/DecrementCest.php
index 577badb32e7..400ccd1d125 100644
--- a/tests/integration/Cache/Adapter/Libmemcached/DecrementCest.php
+++ b/tests/integration/Cache/Adapter/Libmemcached/DecrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Libmemcached;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 
 use function getOptionsLibmemcached;
 
diff --git a/tests/integration/Cache/Adapter/Libmemcached/GetKeysCest.php b/tests/integration/Cache/Adapter/Libmemcached/GetKeysCest.php
index 79255018158..d3271ac7f7b 100644
--- a/tests/integration/Cache/Adapter/Libmemcached/GetKeysCest.php
+++ b/tests/integration/Cache/Adapter/Libmemcached/GetKeysCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Libmemcached;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 
 use function getOptionsLibmemcached;
 
diff --git a/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php b/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php
index 7d3c98894ee..c6d9d2b75f8 100644
--- a/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php
+++ b/tests/integration/Cache/Adapter/Libmemcached/GetSetCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Libmemcached;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Cache\CacheFixtureData;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Cache\CacheFixtureData;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 
 use function getOptionsLibmemcached;
 
diff --git a/tests/integration/Cache/Adapter/Libmemcached/IncrementCest.php b/tests/integration/Cache/Adapter/Libmemcached/IncrementCest.php
index c9feed981c6..3c41a3458bd 100644
--- a/tests/integration/Cache/Adapter/Libmemcached/IncrementCest.php
+++ b/tests/integration/Cache/Adapter/Libmemcached/IncrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Libmemcached;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 
 use function getOptionsLibmemcached;
 
diff --git a/tests/integration/Cache/Adapter/Memory/DecrementCest.php b/tests/integration/Cache/Adapter/Memory/DecrementCest.php
index 7b8b05a5c33..d7faf361d98 100644
--- a/tests/integration/Cache/Adapter/Memory/DecrementCest.php
+++ b/tests/integration/Cache/Adapter/Memory/DecrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Memory;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Memory;
diff --git a/tests/integration/Cache/Adapter/Memory/GetKeysCest.php b/tests/integration/Cache/Adapter/Memory/GetKeysCest.php
index 19ef09dcbab..027fb46eb37 100644
--- a/tests/integration/Cache/Adapter/Memory/GetKeysCest.php
+++ b/tests/integration/Cache/Adapter/Memory/GetKeysCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Memory;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Memory;
diff --git a/tests/integration/Cache/Adapter/Memory/GetSetCest.php b/tests/integration/Cache/Adapter/Memory/GetSetCest.php
index a10c48970f6..c2d06e49d4a 100644
--- a/tests/integration/Cache/Adapter/Memory/GetSetCest.php
+++ b/tests/integration/Cache/Adapter/Memory/GetSetCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Memory;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Memory;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Cache\CacheFixtureData;
+use Phalcon\Tests\Fixtures\Cache\CacheFixtureData;
 
 class GetSetCest
 {
diff --git a/tests/integration/Cache/Adapter/Memory/IncrementCest.php b/tests/integration/Cache/Adapter/Memory/IncrementCest.php
index 4dfeb04bf7d..93b985d9e52 100644
--- a/tests/integration/Cache/Adapter/Memory/IncrementCest.php
+++ b/tests/integration/Cache/Adapter/Memory/IncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Memory;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Memory;
diff --git a/tests/integration/Cache/Adapter/Redis/DecrementCest.php b/tests/integration/Cache/Adapter/Redis/DecrementCest.php
index 6855419443e..a07252e9ac7 100644
--- a/tests/integration/Cache/Adapter/Redis/DecrementCest.php
+++ b/tests/integration/Cache/Adapter/Redis/DecrementCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Redis;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Redis;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 
 use function getOptionsRedis;
 use function uniqid;
diff --git a/tests/integration/Cache/Adapter/Redis/GetKeysCest.php b/tests/integration/Cache/Adapter/Redis/GetKeysCest.php
index 2ccc3e2cf26..c6514cae8b6 100644
--- a/tests/integration/Cache/Adapter/Redis/GetKeysCest.php
+++ b/tests/integration/Cache/Adapter/Redis/GetKeysCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Redis;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Redis;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 
 use function getOptionsRedis;
 
diff --git a/tests/integration/Cache/Adapter/Redis/GetSetCest.php b/tests/integration/Cache/Adapter/Redis/GetSetCest.php
index 295842bb75c..a75d4af6ecb 100644
--- a/tests/integration/Cache/Adapter/Redis/GetSetCest.php
+++ b/tests/integration/Cache/Adapter/Redis/GetSetCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Redis;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Redis;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Cache\CacheFixtureData;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Cache\CacheFixtureData;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 
 use function array_merge;
 use function getOptionsRedis;
diff --git a/tests/integration/Cache/Adapter/Redis/IncrementCest.php b/tests/integration/Cache/Adapter/Redis/IncrementCest.php
index 4653644b894..f4551f68744 100644
--- a/tests/integration/Cache/Adapter/Redis/IncrementCest.php
+++ b/tests/integration/Cache/Adapter/Redis/IncrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Redis;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Redis;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 
 use function getOptionsRedis;
 use function uniqid;
diff --git a/tests/integration/Cache/Adapter/Stream/DecrementCest.php b/tests/integration/Cache/Adapter/Stream/DecrementCest.php
index c997e25e95e..8d0ee4cd7b9 100644
--- a/tests/integration/Cache/Adapter/Stream/DecrementCest.php
+++ b/tests/integration/Cache/Adapter/Stream/DecrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Stream;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Stream;
diff --git a/tests/integration/Cache/Adapter/Stream/GetKeysCest.php b/tests/integration/Cache/Adapter/Stream/GetKeysCest.php
index 172f4ed22e1..178e738497b 100644
--- a/tests/integration/Cache/Adapter/Stream/GetKeysCest.php
+++ b/tests/integration/Cache/Adapter/Stream/GetKeysCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Stream;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Stream;
diff --git a/tests/integration/Cache/Adapter/Stream/GetSetCest.php b/tests/integration/Cache/Adapter/Stream/GetSetCest.php
index b9f9bd6b86a..4afb63886b6 100644
--- a/tests/integration/Cache/Adapter/Stream/GetSetCest.php
+++ b/tests/integration/Cache/Adapter/Stream/GetSetCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Stream;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Stream;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Cache\CacheFixtureData;
+use Phalcon\Tests\Fixtures\Cache\CacheFixtureData;
 
 use function file_put_contents;
 use function outputDir;
diff --git a/tests/integration/Cache/Adapter/Stream/IncrementCest.php b/tests/integration/Cache/Adapter/Stream/IncrementCest.php
index 0e70c2cb85a..bf4f2a395be 100644
--- a/tests/integration/Cache/Adapter/Stream/IncrementCest.php
+++ b/tests/integration/Cache/Adapter/Stream/IncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Cache\Adapter\Stream;
 
 use IntegrationTester;
 use Phalcon\Cache\Adapter\Stream;
diff --git a/tests/integration/Cache/AdapterFactory/NewInstanceCest.php b/tests/integration/Cache/AdapterFactory/NewInstanceCest.php
index 7a4138797df..3c05f4b725c 100644
--- a/tests/integration/Cache/AdapterFactory/NewInstanceCest.php
+++ b/tests/integration/Cache/AdapterFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\AdapterFactory;
+namespace Phalcon\Tests\Integration\Cache\AdapterFactory;
 
 use Codeception\Example;
 use Phalcon\Cache\Adapter\Apcu;
diff --git a/tests/integration/Cache/Cache/ClearCest.php b/tests/integration/Cache/Cache/ClearCest.php
index d569df09fd0..06b58da55a3 100644
--- a/tests/integration/Cache/Cache/ClearCest.php
+++ b/tests/integration/Cache/Cache/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/ConstructCest.php b/tests/integration/Cache/Cache/ConstructCest.php
index b63f8197fda..f1c07a2b250 100644
--- a/tests/integration/Cache/Cache/ConstructCest.php
+++ b/tests/integration/Cache/Cache/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/DeleteCest.php b/tests/integration/Cache/Cache/DeleteCest.php
index 669533ed86e..f19cb58eb24 100644
--- a/tests/integration/Cache/Cache/DeleteCest.php
+++ b/tests/integration/Cache/Cache/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/DeleteMultipleCest.php b/tests/integration/Cache/Cache/DeleteMultipleCest.php
index 04adfd18b49..009dbfe3aa2 100644
--- a/tests/integration/Cache/Cache/DeleteMultipleCest.php
+++ b/tests/integration/Cache/Cache/DeleteMultipleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/GetAdapterCest.php b/tests/integration/Cache/Cache/GetAdapterCest.php
index 112f29be072..201c2d180c4 100644
--- a/tests/integration/Cache/Cache/GetAdapterCest.php
+++ b/tests/integration/Cache/Cache/GetAdapterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\Adapter\AdapterInterface;
diff --git a/tests/integration/Cache/Cache/GetMultipleCest.php b/tests/integration/Cache/Cache/GetMultipleCest.php
index 37e32230f2a..9667d810c55 100644
--- a/tests/integration/Cache/Cache/GetMultipleCest.php
+++ b/tests/integration/Cache/Cache/GetMultipleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/GetSetCest.php b/tests/integration/Cache/Cache/GetSetCest.php
index b403a991e16..3b408c2a3a2 100644
--- a/tests/integration/Cache/Cache/GetSetCest.php
+++ b/tests/integration/Cache/Cache/GetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/HasCest.php b/tests/integration/Cache/Cache/HasCest.php
index 50bdefe6b62..384540952f2 100644
--- a/tests/integration/Cache/Cache/HasCest.php
+++ b/tests/integration/Cache/Cache/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/Cache/SetMultipleCest.php b/tests/integration/Cache/Cache/SetMultipleCest.php
index 5e8e06ae10b..81fd34790f4 100644
--- a/tests/integration/Cache/Cache/SetMultipleCest.php
+++ b/tests/integration/Cache/Cache/SetMultipleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\Cache;
+namespace Phalcon\Tests\Integration\Cache\Cache;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Cache/CacheFactory/LoadCest.php b/tests/integration/Cache/CacheFactory/LoadCest.php
index 9a11bec2387..6ffaee4c4ba 100644
--- a/tests/integration/Cache/CacheFactory/LoadCest.php
+++ b/tests/integration/Cache/CacheFactory/LoadCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\CacheFactory;
+namespace Phalcon\Tests\Integration\Cache\CacheFactory;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Cache\CacheFactory;
 use Phalcon\Storage\Serializer\None;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 use Psr\SimpleCache\CacheInterface;
 use IntegrationTester;
 
diff --git a/tests/integration/Cache/CacheFactory/NewInstanceCest.php b/tests/integration/Cache/CacheFactory/NewInstanceCest.php
index d9527d47243..89c44529e6a 100644
--- a/tests/integration/Cache/CacheFactory/NewInstanceCest.php
+++ b/tests/integration/Cache/CacheFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Cache\CacheFactory;
+namespace Phalcon\Tests\Integration\Cache\CacheFactory;
 
 use Phalcon\Cache;
 use Phalcon\Cache\AdapterFactory;
diff --git a/tests/integration/Db/Dialect/Mysql/AddColumnCest.php b/tests/integration/Db/Dialect/Mysql/AddColumnCest.php
index e4e7ecbf75e..26715281dca 100644
--- a/tests/integration/Db/Dialect/Mysql/AddColumnCest.php
+++ b/tests/integration/Db/Dialect/Mysql/AddColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
diff --git a/tests/integration/Db/Dialect/Mysql/CreateTableCest.php b/tests/integration/Db/Dialect/Mysql/CreateTableCest.php
index b376b30729d..5186ff46e5b 100644
--- a/tests/integration/Db/Dialect/Mysql/CreateTableCest.php
+++ b/tests/integration/Db/Dialect/Mysql/CreateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
diff --git a/tests/integration/Db/Dialect/Mysql/ModifyColumnCest.php b/tests/integration/Db/Dialect/Mysql/ModifyColumnCest.php
index a6f064d3158..c138f89353d 100644
--- a/tests/integration/Db/Dialect/Mysql/ModifyColumnCest.php
+++ b/tests/integration/Db/Dialect/Mysql/ModifyColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
diff --git a/tests/integration/Forms/Element/Check/AddFilterCest.php b/tests/integration/Forms/Element/Check/AddFilterCest.php
index 0bcc6f72d24..1364e7b4713 100644
--- a/tests/integration/Forms/Element/Check/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Check/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/AddValidatorCest.php b/tests/integration/Forms/Element/Check/AddValidatorCest.php
index 1efd4bd047a..5accfc28e80 100644
--- a/tests/integration/Forms/Element/Check/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Check/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/AddValidatorsCest.php b/tests/integration/Forms/Element/Check/AddValidatorsCest.php
index a59a65da41a..18560689530 100644
--- a/tests/integration/Forms/Element/Check/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Check/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/AppendMessageCest.php b/tests/integration/Forms/Element/Check/AppendMessageCest.php
index 506fea3ad06..96f2817d680 100644
--- a/tests/integration/Forms/Element/Check/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Check/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/ClearCest.php b/tests/integration/Forms/Element/Check/ClearCest.php
index 2cf28db95bb..be6bd4028f0 100644
--- a/tests/integration/Forms/Element/Check/ClearCest.php
+++ b/tests/integration/Forms/Element/Check/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/ConstructCest.php b/tests/integration/Forms/Element/Check/ConstructCest.php
index 848ba05d302..14904d9f79c 100644
--- a/tests/integration/Forms/Element/Check/ConstructCest.php
+++ b/tests/integration/Forms/Element/Check/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetAttributeCest.php b/tests/integration/Forms/Element/Check/GetAttributeCest.php
index c1566c27cb1..eab28adfcda 100644
--- a/tests/integration/Forms/Element/Check/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Check/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetAttributesCest.php b/tests/integration/Forms/Element/Check/GetAttributesCest.php
index 7ad0babd139..fc5416b6c6a 100644
--- a/tests/integration/Forms/Element/Check/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Check/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetDefaultCest.php b/tests/integration/Forms/Element/Check/GetDefaultCest.php
index f4c2f208976..9fc4fca1765 100644
--- a/tests/integration/Forms/Element/Check/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Check/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetFiltersCest.php b/tests/integration/Forms/Element/Check/GetFiltersCest.php
index 986ee89835f..cee17c72cd7 100644
--- a/tests/integration/Forms/Element/Check/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Check/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetLabelCest.php b/tests/integration/Forms/Element/Check/GetLabelCest.php
index 74387e71cb4..cb7bbc0e3bc 100644
--- a/tests/integration/Forms/Element/Check/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Check/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetMessagesCest.php b/tests/integration/Forms/Element/Check/GetMessagesCest.php
index 8cbff634ce2..a808c3dc80a 100644
--- a/tests/integration/Forms/Element/Check/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Check/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetSetFormCest.php b/tests/integration/Forms/Element/Check/GetSetFormCest.php
index 737c9a04bd2..b6457d374de 100644
--- a/tests/integration/Forms/Element/Check/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Check/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Check;
diff --git a/tests/integration/Forms/Element/Check/GetSetNameCest.php b/tests/integration/Forms/Element/Check/GetSetNameCest.php
index ffc0c3914b5..553efe5ce4c 100644
--- a/tests/integration/Forms/Element/Check/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Check/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Check;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Check/GetUserOptionCest.php b/tests/integration/Forms/Element/Check/GetUserOptionCest.php
index 5c6fcb4645a..91ba7e19aac 100644
--- a/tests/integration/Forms/Element/Check/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Check/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetUserOptionsCest.php b/tests/integration/Forms/Element/Check/GetUserOptionsCest.php
index acca659a0bd..b0bbf14d72a 100644
--- a/tests/integration/Forms/Element/Check/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Check/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetValidatorsCest.php b/tests/integration/Forms/Element/Check/GetValidatorsCest.php
index f3c451c12c2..ec4e3eb894d 100644
--- a/tests/integration/Forms/Element/Check/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Check/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/GetValueCest.php b/tests/integration/Forms/Element/Check/GetValueCest.php
index 8b19b2ec6d1..3d2a75714a6 100644
--- a/tests/integration/Forms/Element/Check/GetValueCest.php
+++ b/tests/integration/Forms/Element/Check/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/HasMessagesCest.php b/tests/integration/Forms/Element/Check/HasMessagesCest.php
index 8652db01f5d..e56769e0863 100644
--- a/tests/integration/Forms/Element/Check/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Check/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/LabelCest.php b/tests/integration/Forms/Element/Check/LabelCest.php
index 253ed772808..d947f7a7569 100644
--- a/tests/integration/Forms/Element/Check/LabelCest.php
+++ b/tests/integration/Forms/Element/Check/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/PrepareAttributesCest.php b/tests/integration/Forms/Element/Check/PrepareAttributesCest.php
index a4d495c096c..9bd50dc5146 100644
--- a/tests/integration/Forms/Element/Check/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Check/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/RenderCest.php b/tests/integration/Forms/Element/Check/RenderCest.php
index e288fcad1ef..780eefa0663 100644
--- a/tests/integration/Forms/Element/Check/RenderCest.php
+++ b/tests/integration/Forms/Element/Check/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Check;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Check/SetAttributeCest.php b/tests/integration/Forms/Element/Check/SetAttributeCest.php
index efdd58a11ba..a0fe7bbc6da 100644
--- a/tests/integration/Forms/Element/Check/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Check/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetAttributesCest.php b/tests/integration/Forms/Element/Check/SetAttributesCest.php
index 54bc0849584..f37f6d32f23 100644
--- a/tests/integration/Forms/Element/Check/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Check/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetDefaultCest.php b/tests/integration/Forms/Element/Check/SetDefaultCest.php
index 5c3219354d3..b6ac73adaee 100644
--- a/tests/integration/Forms/Element/Check/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Check/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetFiltersCest.php b/tests/integration/Forms/Element/Check/SetFiltersCest.php
index f4b470c5480..7240fe62059 100644
--- a/tests/integration/Forms/Element/Check/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Check/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetLabelCest.php b/tests/integration/Forms/Element/Check/SetLabelCest.php
index 5c7901c0d94..19faf4721c1 100644
--- a/tests/integration/Forms/Element/Check/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Check/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetMessagesCest.php b/tests/integration/Forms/Element/Check/SetMessagesCest.php
index 67ebbf83bc3..2f60f806012 100644
--- a/tests/integration/Forms/Element/Check/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Check/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetUserOptionCest.php b/tests/integration/Forms/Element/Check/SetUserOptionCest.php
index 524c6d152eb..83343b6f0c5 100644
--- a/tests/integration/Forms/Element/Check/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Check/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/SetUserOptionsCest.php b/tests/integration/Forms/Element/Check/SetUserOptionsCest.php
index 7e6be114df1..2d65de5235c 100644
--- a/tests/integration/Forms/Element/Check/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Check/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Check/ToStringCest.php b/tests/integration/Forms/Element/Check/ToStringCest.php
index 81776dbcac6..0352df60fcb 100644
--- a/tests/integration/Forms/Element/Check/ToStringCest.php
+++ b/tests/integration/Forms/Element/Check/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Check;
+namespace Phalcon\Tests\Integration\Forms\Element\Check;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Check;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Date/AddFilterCest.php b/tests/integration/Forms/Element/Date/AddFilterCest.php
index b3ffa76dc8f..ea476305410 100644
--- a/tests/integration/Forms/Element/Date/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Date/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/AddValidatorCest.php b/tests/integration/Forms/Element/Date/AddValidatorCest.php
index 981fe9b6191..024a88f31b6 100644
--- a/tests/integration/Forms/Element/Date/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Date/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/AddValidatorsCest.php b/tests/integration/Forms/Element/Date/AddValidatorsCest.php
index 2a299716bb8..a356aa48d1d 100644
--- a/tests/integration/Forms/Element/Date/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Date/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/AppendMessageCest.php b/tests/integration/Forms/Element/Date/AppendMessageCest.php
index bf7a6516048..64eab8fba5d 100644
--- a/tests/integration/Forms/Element/Date/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Date/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/ClearCest.php b/tests/integration/Forms/Element/Date/ClearCest.php
index 7fa89ca13f8..6c453acab9f 100644
--- a/tests/integration/Forms/Element/Date/ClearCest.php
+++ b/tests/integration/Forms/Element/Date/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/ConstructCest.php b/tests/integration/Forms/Element/Date/ConstructCest.php
index 600078d5769..415e5e770c5 100644
--- a/tests/integration/Forms/Element/Date/ConstructCest.php
+++ b/tests/integration/Forms/Element/Date/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetAttributeCest.php b/tests/integration/Forms/Element/Date/GetAttributeCest.php
index 80f21f686a3..ab0e9225aa3 100644
--- a/tests/integration/Forms/Element/Date/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Date/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetAttributesCest.php b/tests/integration/Forms/Element/Date/GetAttributesCest.php
index 9e4d6cc10d3..97f987bb8e7 100644
--- a/tests/integration/Forms/Element/Date/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Date/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetDefaultCest.php b/tests/integration/Forms/Element/Date/GetDefaultCest.php
index 1a96fd96509..f3418585917 100644
--- a/tests/integration/Forms/Element/Date/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Date/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetFiltersCest.php b/tests/integration/Forms/Element/Date/GetFiltersCest.php
index 9aa5183bc68..034f327d29d 100644
--- a/tests/integration/Forms/Element/Date/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Date/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetLabelCest.php b/tests/integration/Forms/Element/Date/GetLabelCest.php
index db5fa51aeaa..d1e0c21d1a8 100644
--- a/tests/integration/Forms/Element/Date/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Date/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetMessagesCest.php b/tests/integration/Forms/Element/Date/GetMessagesCest.php
index 2fe2e0fa1e0..0cbfac3bfab 100644
--- a/tests/integration/Forms/Element/Date/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Date/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetSetFormCest.php b/tests/integration/Forms/Element/Date/GetSetFormCest.php
index 30320fadeed..81bbad1b072 100644
--- a/tests/integration/Forms/Element/Date/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Date/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Date;
diff --git a/tests/integration/Forms/Element/Date/GetSetNameCest.php b/tests/integration/Forms/Element/Date/GetSetNameCest.php
index d1b1be6cec6..8e250ab9755 100644
--- a/tests/integration/Forms/Element/Date/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Date/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Date;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Date/GetUserOptionCest.php b/tests/integration/Forms/Element/Date/GetUserOptionCest.php
index 20759da731a..f93f5ec79af 100644
--- a/tests/integration/Forms/Element/Date/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Date/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetUserOptionsCest.php b/tests/integration/Forms/Element/Date/GetUserOptionsCest.php
index ab5b28f9942..e552e185408 100644
--- a/tests/integration/Forms/Element/Date/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Date/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetValidatorsCest.php b/tests/integration/Forms/Element/Date/GetValidatorsCest.php
index 63d0aced950..1c7c7362806 100644
--- a/tests/integration/Forms/Element/Date/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Date/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/GetValueCest.php b/tests/integration/Forms/Element/Date/GetValueCest.php
index cdbba712cf6..bacc1727f11 100644
--- a/tests/integration/Forms/Element/Date/GetValueCest.php
+++ b/tests/integration/Forms/Element/Date/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/HasMessagesCest.php b/tests/integration/Forms/Element/Date/HasMessagesCest.php
index 0b0304c6cfc..9f43b6bd5c4 100644
--- a/tests/integration/Forms/Element/Date/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Date/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/LabelCest.php b/tests/integration/Forms/Element/Date/LabelCest.php
index ff6d9ad516d..62b4c68cf7e 100644
--- a/tests/integration/Forms/Element/Date/LabelCest.php
+++ b/tests/integration/Forms/Element/Date/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/PrepareAttributesCest.php b/tests/integration/Forms/Element/Date/PrepareAttributesCest.php
index 635e45ed3f7..e99bf725bfb 100644
--- a/tests/integration/Forms/Element/Date/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Date/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/RenderCest.php b/tests/integration/Forms/Element/Date/RenderCest.php
index 3efcc0b1b01..15fe9725144 100644
--- a/tests/integration/Forms/Element/Date/RenderCest.php
+++ b/tests/integration/Forms/Element/Date/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Date;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Date/SetAttributeCest.php b/tests/integration/Forms/Element/Date/SetAttributeCest.php
index db9ebc062a8..c6bde4a9b2f 100644
--- a/tests/integration/Forms/Element/Date/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Date/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetAttributesCest.php b/tests/integration/Forms/Element/Date/SetAttributesCest.php
index 1c33052ef1e..437d48e8772 100644
--- a/tests/integration/Forms/Element/Date/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Date/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetDefaultCest.php b/tests/integration/Forms/Element/Date/SetDefaultCest.php
index 8320908616d..97bafda3ae3 100644
--- a/tests/integration/Forms/Element/Date/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Date/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetFiltersCest.php b/tests/integration/Forms/Element/Date/SetFiltersCest.php
index 75f15b573f2..5b6e847e211 100644
--- a/tests/integration/Forms/Element/Date/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Date/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetLabelCest.php b/tests/integration/Forms/Element/Date/SetLabelCest.php
index 20b00b1df00..457931bb825 100644
--- a/tests/integration/Forms/Element/Date/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Date/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetMessagesCest.php b/tests/integration/Forms/Element/Date/SetMessagesCest.php
index 3faf5ea7622..b49cc956e90 100644
--- a/tests/integration/Forms/Element/Date/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Date/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetUserOptionCest.php b/tests/integration/Forms/Element/Date/SetUserOptionCest.php
index b44ef3bae1d..fd3fca3eb3e 100644
--- a/tests/integration/Forms/Element/Date/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Date/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/SetUserOptionsCest.php b/tests/integration/Forms/Element/Date/SetUserOptionsCest.php
index 42f1279a80f..784ae963a7b 100644
--- a/tests/integration/Forms/Element/Date/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Date/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Date/ToStringCest.php b/tests/integration/Forms/Element/Date/ToStringCest.php
index f258526f8ab..5807c31f3c4 100644
--- a/tests/integration/Forms/Element/Date/ToStringCest.php
+++ b/tests/integration/Forms/Element/Date/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Date;
+namespace Phalcon\Tests\Integration\Forms\Element\Date;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Date;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Email/AddFilterCest.php b/tests/integration/Forms/Element/Email/AddFilterCest.php
index d23621571e9..bff4151a06a 100644
--- a/tests/integration/Forms/Element/Email/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Email/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/AddValidatorCest.php b/tests/integration/Forms/Element/Email/AddValidatorCest.php
index 1069967b81c..cee1738492e 100644
--- a/tests/integration/Forms/Element/Email/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Email/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/AddValidatorsCest.php b/tests/integration/Forms/Element/Email/AddValidatorsCest.php
index 868ba1af193..0def3d0bb1f 100644
--- a/tests/integration/Forms/Element/Email/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Email/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/AppendMessageCest.php b/tests/integration/Forms/Element/Email/AppendMessageCest.php
index 0a5fc15350a..3b1ec4eb77e 100644
--- a/tests/integration/Forms/Element/Email/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Email/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/ClearCest.php b/tests/integration/Forms/Element/Email/ClearCest.php
index 0c9ff9cf071..cb421ae96f1 100644
--- a/tests/integration/Forms/Element/Email/ClearCest.php
+++ b/tests/integration/Forms/Element/Email/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/ConstructCest.php b/tests/integration/Forms/Element/Email/ConstructCest.php
index cf4f462776e..e11cfe591cb 100644
--- a/tests/integration/Forms/Element/Email/ConstructCest.php
+++ b/tests/integration/Forms/Element/Email/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetAttributeCest.php b/tests/integration/Forms/Element/Email/GetAttributeCest.php
index b6e39955bc7..1ddb3fd2017 100644
--- a/tests/integration/Forms/Element/Email/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Email/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetAttributesCest.php b/tests/integration/Forms/Element/Email/GetAttributesCest.php
index 104de616a8d..4ea5bdb1ed0 100644
--- a/tests/integration/Forms/Element/Email/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Email/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetDefaultCest.php b/tests/integration/Forms/Element/Email/GetDefaultCest.php
index 412f46977ef..b689d9bac65 100644
--- a/tests/integration/Forms/Element/Email/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Email/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetFiltersCest.php b/tests/integration/Forms/Element/Email/GetFiltersCest.php
index 75c6ed41a05..cecc21cbc4d 100644
--- a/tests/integration/Forms/Element/Email/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Email/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetLabelCest.php b/tests/integration/Forms/Element/Email/GetLabelCest.php
index 5bff630739a..02b776e8edd 100644
--- a/tests/integration/Forms/Element/Email/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Email/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetMessagesCest.php b/tests/integration/Forms/Element/Email/GetMessagesCest.php
index 2c7cf94a8a1..a09201a7139 100644
--- a/tests/integration/Forms/Element/Email/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Email/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetSetFormCest.php b/tests/integration/Forms/Element/Email/GetSetFormCest.php
index 8ffca3cb903..0d1d8f38bbc 100644
--- a/tests/integration/Forms/Element/Email/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Email/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Email;
diff --git a/tests/integration/Forms/Element/Email/GetSetNameCest.php b/tests/integration/Forms/Element/Email/GetSetNameCest.php
index 3503c60ff74..22adaf6bcc6 100644
--- a/tests/integration/Forms/Element/Email/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Email/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Email;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Email/GetUserOptionCest.php b/tests/integration/Forms/Element/Email/GetUserOptionCest.php
index 074f57a5ab3..e53a6661a27 100644
--- a/tests/integration/Forms/Element/Email/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Email/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetUserOptionsCest.php b/tests/integration/Forms/Element/Email/GetUserOptionsCest.php
index 1bcde4b68f1..fd88b78a8bb 100644
--- a/tests/integration/Forms/Element/Email/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Email/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetValidatorsCest.php b/tests/integration/Forms/Element/Email/GetValidatorsCest.php
index 74a12807643..1df3efcc40e 100644
--- a/tests/integration/Forms/Element/Email/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Email/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/GetValueCest.php b/tests/integration/Forms/Element/Email/GetValueCest.php
index d5fdc351f67..8ecb253d73c 100644
--- a/tests/integration/Forms/Element/Email/GetValueCest.php
+++ b/tests/integration/Forms/Element/Email/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/HasMessagesCest.php b/tests/integration/Forms/Element/Email/HasMessagesCest.php
index 16e62ca7711..0c15c340edf 100644
--- a/tests/integration/Forms/Element/Email/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Email/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/LabelCest.php b/tests/integration/Forms/Element/Email/LabelCest.php
index c325163c010..00ece0a151a 100644
--- a/tests/integration/Forms/Element/Email/LabelCest.php
+++ b/tests/integration/Forms/Element/Email/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/PrepareAttributesCest.php b/tests/integration/Forms/Element/Email/PrepareAttributesCest.php
index 4b00e8843b5..5bd81a692f3 100644
--- a/tests/integration/Forms/Element/Email/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Email/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/RenderCest.php b/tests/integration/Forms/Element/Email/RenderCest.php
index 8f85e75d792..a2cf41b68a4 100644
--- a/tests/integration/Forms/Element/Email/RenderCest.php
+++ b/tests/integration/Forms/Element/Email/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Email;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Email/SetAttributeCest.php b/tests/integration/Forms/Element/Email/SetAttributeCest.php
index b502721e5ba..009dea7bffe 100644
--- a/tests/integration/Forms/Element/Email/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Email/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetAttributesCest.php b/tests/integration/Forms/Element/Email/SetAttributesCest.php
index bb2a27d6308..b792aa4ca30 100644
--- a/tests/integration/Forms/Element/Email/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Email/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetDefaultCest.php b/tests/integration/Forms/Element/Email/SetDefaultCest.php
index 2ad3fe06668..6177c835ef8 100644
--- a/tests/integration/Forms/Element/Email/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Email/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetFiltersCest.php b/tests/integration/Forms/Element/Email/SetFiltersCest.php
index 5cdf50ba550..f55c08530b6 100644
--- a/tests/integration/Forms/Element/Email/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Email/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetLabelCest.php b/tests/integration/Forms/Element/Email/SetLabelCest.php
index 93901e7a90a..9ea916f8e7f 100644
--- a/tests/integration/Forms/Element/Email/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Email/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetMessagesCest.php b/tests/integration/Forms/Element/Email/SetMessagesCest.php
index 134628282eb..2a033d236e5 100644
--- a/tests/integration/Forms/Element/Email/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Email/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetUserOptionCest.php b/tests/integration/Forms/Element/Email/SetUserOptionCest.php
index c5516959f8c..004f739e8d4 100644
--- a/tests/integration/Forms/Element/Email/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Email/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/SetUserOptionsCest.php b/tests/integration/Forms/Element/Email/SetUserOptionsCest.php
index dd85a77e21d..92cf778264e 100644
--- a/tests/integration/Forms/Element/Email/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Email/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Email/ToStringCest.php b/tests/integration/Forms/Element/Email/ToStringCest.php
index 1449a17b6ce..59fcecbf9df 100644
--- a/tests/integration/Forms/Element/Email/ToStringCest.php
+++ b/tests/integration/Forms/Element/Email/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Email;
+namespace Phalcon\Tests\Integration\Forms\Element\Email;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Email;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/File/AddFilterCest.php b/tests/integration/Forms/Element/File/AddFilterCest.php
index c3ba0beee14..3bd04ebdf90 100644
--- a/tests/integration/Forms/Element/File/AddFilterCest.php
+++ b/tests/integration/Forms/Element/File/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/AddValidatorCest.php b/tests/integration/Forms/Element/File/AddValidatorCest.php
index e90185b22f5..af9acfd8c54 100644
--- a/tests/integration/Forms/Element/File/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/File/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/AddValidatorsCest.php b/tests/integration/Forms/Element/File/AddValidatorsCest.php
index 0c3ea975962..e9ca6d48304 100644
--- a/tests/integration/Forms/Element/File/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/File/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/AppendMessageCest.php b/tests/integration/Forms/Element/File/AppendMessageCest.php
index de4d7471b19..52304b434ca 100644
--- a/tests/integration/Forms/Element/File/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/File/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/ClearCest.php b/tests/integration/Forms/Element/File/ClearCest.php
index 53cd6eb1a81..d248757873f 100644
--- a/tests/integration/Forms/Element/File/ClearCest.php
+++ b/tests/integration/Forms/Element/File/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/ConstructCest.php b/tests/integration/Forms/Element/File/ConstructCest.php
index 7a547d18fff..0d771bf3933 100644
--- a/tests/integration/Forms/Element/File/ConstructCest.php
+++ b/tests/integration/Forms/Element/File/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetAttributeCest.php b/tests/integration/Forms/Element/File/GetAttributeCest.php
index cfe55e1d501..6987296ba38 100644
--- a/tests/integration/Forms/Element/File/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/File/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetAttributesCest.php b/tests/integration/Forms/Element/File/GetAttributesCest.php
index e8bd7385273..6ffa3d86eb2 100644
--- a/tests/integration/Forms/Element/File/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/File/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetDefaultCest.php b/tests/integration/Forms/Element/File/GetDefaultCest.php
index db2fec4a2b5..6a1e58038e3 100644
--- a/tests/integration/Forms/Element/File/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/File/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetFiltersCest.php b/tests/integration/Forms/Element/File/GetFiltersCest.php
index 1bad93ebaf8..8cf6cd4d8f6 100644
--- a/tests/integration/Forms/Element/File/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/File/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetLabelCest.php b/tests/integration/Forms/Element/File/GetLabelCest.php
index 748f57d167e..6d963fd7123 100644
--- a/tests/integration/Forms/Element/File/GetLabelCest.php
+++ b/tests/integration/Forms/Element/File/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetMessagesCest.php b/tests/integration/Forms/Element/File/GetMessagesCest.php
index 0c7bd342902..8de672cc7a4 100644
--- a/tests/integration/Forms/Element/File/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/File/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetSetFormCest.php b/tests/integration/Forms/Element/File/GetSetFormCest.php
index dd6beb7b188..4601157b005 100644
--- a/tests/integration/Forms/Element/File/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/File/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\File;
diff --git a/tests/integration/Forms/Element/File/GetSetNameCest.php b/tests/integration/Forms/Element/File/GetSetNameCest.php
index f710ebaf195..d6360f6d35e 100644
--- a/tests/integration/Forms/Element/File/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/File/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\File;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/File/GetUserOptionCest.php b/tests/integration/Forms/Element/File/GetUserOptionCest.php
index 998bf0928e9..febd3481e63 100644
--- a/tests/integration/Forms/Element/File/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/File/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetUserOptionsCest.php b/tests/integration/Forms/Element/File/GetUserOptionsCest.php
index 5ea5a43e24f..861ff59ee85 100644
--- a/tests/integration/Forms/Element/File/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/File/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetValidatorsCest.php b/tests/integration/Forms/Element/File/GetValidatorsCest.php
index 1a3bfb815c8..462f67d9147 100644
--- a/tests/integration/Forms/Element/File/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/File/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/GetValueCest.php b/tests/integration/Forms/Element/File/GetValueCest.php
index 93a263fc1b9..57ccfb85d2d 100644
--- a/tests/integration/Forms/Element/File/GetValueCest.php
+++ b/tests/integration/Forms/Element/File/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/HasMessagesCest.php b/tests/integration/Forms/Element/File/HasMessagesCest.php
index 1887d2375ac..9d62c7a1c35 100644
--- a/tests/integration/Forms/Element/File/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/File/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/LabelCest.php b/tests/integration/Forms/Element/File/LabelCest.php
index d3b543892dd..e82b1372411 100644
--- a/tests/integration/Forms/Element/File/LabelCest.php
+++ b/tests/integration/Forms/Element/File/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/PrepareAttributesCest.php b/tests/integration/Forms/Element/File/PrepareAttributesCest.php
index 49cc909eb99..8e50a464a2b 100644
--- a/tests/integration/Forms/Element/File/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/File/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/RenderCest.php b/tests/integration/Forms/Element/File/RenderCest.php
index dc6e0ee386a..15446f012cd 100644
--- a/tests/integration/Forms/Element/File/RenderCest.php
+++ b/tests/integration/Forms/Element/File/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\File;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/File/SetAttributeCest.php b/tests/integration/Forms/Element/File/SetAttributeCest.php
index f0ab21d2e09..530400e9ad0 100644
--- a/tests/integration/Forms/Element/File/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/File/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetAttributesCest.php b/tests/integration/Forms/Element/File/SetAttributesCest.php
index 2360f58336c..0c6d3a78256 100644
--- a/tests/integration/Forms/Element/File/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/File/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetDefaultCest.php b/tests/integration/Forms/Element/File/SetDefaultCest.php
index 6fd98ad904b..95065152945 100644
--- a/tests/integration/Forms/Element/File/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/File/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetFiltersCest.php b/tests/integration/Forms/Element/File/SetFiltersCest.php
index 37acf42c20d..31516976f16 100644
--- a/tests/integration/Forms/Element/File/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/File/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetLabelCest.php b/tests/integration/Forms/Element/File/SetLabelCest.php
index 096f18aaed7..f8bac765390 100644
--- a/tests/integration/Forms/Element/File/SetLabelCest.php
+++ b/tests/integration/Forms/Element/File/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetMessagesCest.php b/tests/integration/Forms/Element/File/SetMessagesCest.php
index 0b5d1000f6a..2b62d4c41a3 100644
--- a/tests/integration/Forms/Element/File/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/File/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetUserOptionCest.php b/tests/integration/Forms/Element/File/SetUserOptionCest.php
index edd7a6d4b08..ebf22304acb 100644
--- a/tests/integration/Forms/Element/File/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/File/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/SetUserOptionsCest.php b/tests/integration/Forms/Element/File/SetUserOptionsCest.php
index 1dfab4c8b6f..a41b6765535 100644
--- a/tests/integration/Forms/Element/File/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/File/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/File/ToStringCest.php b/tests/integration/Forms/Element/File/ToStringCest.php
index a8ca9945ffd..76901b70750 100644
--- a/tests/integration/Forms/Element/File/ToStringCest.php
+++ b/tests/integration/Forms/Element/File/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\File;
+namespace Phalcon\Tests\Integration\Forms\Element\File;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\File;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Hidden/AddFilterCest.php b/tests/integration/Forms/Element/Hidden/AddFilterCest.php
index 057d13d3ab8..3f418e3b780 100644
--- a/tests/integration/Forms/Element/Hidden/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Hidden/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/AddValidatorCest.php b/tests/integration/Forms/Element/Hidden/AddValidatorCest.php
index 35fc41591d4..ee7540108c3 100644
--- a/tests/integration/Forms/Element/Hidden/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Hidden/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php b/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php
index 949eb4d9bf2..1beb2d922ba 100644
--- a/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/AppendMessageCest.php b/tests/integration/Forms/Element/Hidden/AppendMessageCest.php
index 4534def7296..3e5bad97848 100644
--- a/tests/integration/Forms/Element/Hidden/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Hidden/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/ClearCest.php b/tests/integration/Forms/Element/Hidden/ClearCest.php
index bedb94b4612..584020be2ad 100644
--- a/tests/integration/Forms/Element/Hidden/ClearCest.php
+++ b/tests/integration/Forms/Element/Hidden/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/ConstructCest.php b/tests/integration/Forms/Element/Hidden/ConstructCest.php
index 9926755b62b..0ed0f6c0444 100644
--- a/tests/integration/Forms/Element/Hidden/ConstructCest.php
+++ b/tests/integration/Forms/Element/Hidden/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetAttributeCest.php b/tests/integration/Forms/Element/Hidden/GetAttributeCest.php
index 8d0fee54ebe..b898c4e3a5a 100644
--- a/tests/integration/Forms/Element/Hidden/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetAttributesCest.php b/tests/integration/Forms/Element/Hidden/GetAttributesCest.php
index d9790862f21..586c4c3e29a 100644
--- a/tests/integration/Forms/Element/Hidden/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetDefaultCest.php b/tests/integration/Forms/Element/Hidden/GetDefaultCest.php
index 1491d2999ed..8962ecd863a 100644
--- a/tests/integration/Forms/Element/Hidden/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetFiltersCest.php b/tests/integration/Forms/Element/Hidden/GetFiltersCest.php
index b01ada34150..2d25fea264f 100644
--- a/tests/integration/Forms/Element/Hidden/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetLabelCest.php b/tests/integration/Forms/Element/Hidden/GetLabelCest.php
index 3f3c3c4f3a0..5fd3fe34c9e 100644
--- a/tests/integration/Forms/Element/Hidden/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetMessagesCest.php b/tests/integration/Forms/Element/Hidden/GetMessagesCest.php
index 256e735c2c9..a7f22ab0c4d 100644
--- a/tests/integration/Forms/Element/Hidden/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetSetFormCest.php b/tests/integration/Forms/Element/Hidden/GetSetFormCest.php
index a6a7bcf19e9..6d0d354d32c 100644
--- a/tests/integration/Forms/Element/Hidden/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Hidden;
diff --git a/tests/integration/Forms/Element/Hidden/GetSetNameCest.php b/tests/integration/Forms/Element/Hidden/GetSetNameCest.php
index 2509ec1ffd8..34643f60cb2 100644
--- a/tests/integration/Forms/Element/Hidden/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Hidden;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php b/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php
index 178b0e9368c..38635d1aa2e 100644
--- a/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php b/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php
index 39107ae63c9..a9dc8508463 100644
--- a/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php b/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php
index 00a1bcaadc5..0345f45f93f 100644
--- a/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/GetValueCest.php b/tests/integration/Forms/Element/Hidden/GetValueCest.php
index bd3daa46322..b9da109da4e 100644
--- a/tests/integration/Forms/Element/Hidden/GetValueCest.php
+++ b/tests/integration/Forms/Element/Hidden/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/HasMessagesCest.php b/tests/integration/Forms/Element/Hidden/HasMessagesCest.php
index 8e0d4571a88..9e391abb0b2 100644
--- a/tests/integration/Forms/Element/Hidden/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Hidden/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/LabelCest.php b/tests/integration/Forms/Element/Hidden/LabelCest.php
index 12c082e0689..0d5285bf8e9 100644
--- a/tests/integration/Forms/Element/Hidden/LabelCest.php
+++ b/tests/integration/Forms/Element/Hidden/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/PrepareAttributesCest.php b/tests/integration/Forms/Element/Hidden/PrepareAttributesCest.php
index a31d49258c4..d42ef66116d 100644
--- a/tests/integration/Forms/Element/Hidden/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Hidden/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/RenderCest.php b/tests/integration/Forms/Element/Hidden/RenderCest.php
index 28ac271c2eb..54573c7043d 100644
--- a/tests/integration/Forms/Element/Hidden/RenderCest.php
+++ b/tests/integration/Forms/Element/Hidden/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Hidden;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Hidden/SetAttributeCest.php b/tests/integration/Forms/Element/Hidden/SetAttributeCest.php
index 7b8bfbb3960..a2e314d99a5 100644
--- a/tests/integration/Forms/Element/Hidden/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetAttributesCest.php b/tests/integration/Forms/Element/Hidden/SetAttributesCest.php
index 0881ab570c3..ec28a30bb0a 100644
--- a/tests/integration/Forms/Element/Hidden/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetDefaultCest.php b/tests/integration/Forms/Element/Hidden/SetDefaultCest.php
index f28442085ef..5c61abb5ec2 100644
--- a/tests/integration/Forms/Element/Hidden/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetFiltersCest.php b/tests/integration/Forms/Element/Hidden/SetFiltersCest.php
index 9a236cab5b1..19f3d01002f 100644
--- a/tests/integration/Forms/Element/Hidden/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetLabelCest.php b/tests/integration/Forms/Element/Hidden/SetLabelCest.php
index 73ec449ba1a..58726d098c3 100644
--- a/tests/integration/Forms/Element/Hidden/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetMessagesCest.php b/tests/integration/Forms/Element/Hidden/SetMessagesCest.php
index 414dcb52fc0..be71aa64610 100644
--- a/tests/integration/Forms/Element/Hidden/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php b/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php
index b8646ef11f2..0df29e0a66e 100644
--- a/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php b/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php
index d8d1000c197..a4322660e4c 100644
--- a/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/ToStringCest.php b/tests/integration/Forms/Element/Hidden/ToStringCest.php
index 629c8f03d4d..11d4f4a35ba 100644
--- a/tests/integration/Forms/Element/Hidden/ToStringCest.php
+++ b/tests/integration/Forms/Element/Hidden/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Hidden;
+namespace Phalcon\Tests\Integration\Forms\Element\Hidden;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Hidden;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Numeric/AddFilterCest.php b/tests/integration/Forms/Element/Numeric/AddFilterCest.php
index 0d935393709..d268adb2b0f 100644
--- a/tests/integration/Forms/Element/Numeric/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Numeric/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/AddValidatorCest.php b/tests/integration/Forms/Element/Numeric/AddValidatorCest.php
index 74c23513e8c..ca6cc3bb9ee 100644
--- a/tests/integration/Forms/Element/Numeric/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Numeric/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php b/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php
index b751bd64d7e..96ec20f4626 100644
--- a/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/AppendMessageCest.php b/tests/integration/Forms/Element/Numeric/AppendMessageCest.php
index 311cc749d39..a952928c2a2 100644
--- a/tests/integration/Forms/Element/Numeric/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Numeric/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/ClearCest.php b/tests/integration/Forms/Element/Numeric/ClearCest.php
index 94451202df1..aadc07b7b8e 100644
--- a/tests/integration/Forms/Element/Numeric/ClearCest.php
+++ b/tests/integration/Forms/Element/Numeric/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/ConstructCest.php b/tests/integration/Forms/Element/Numeric/ConstructCest.php
index c6cb9815bed..df4abcd85b1 100644
--- a/tests/integration/Forms/Element/Numeric/ConstructCest.php
+++ b/tests/integration/Forms/Element/Numeric/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetAttributeCest.php b/tests/integration/Forms/Element/Numeric/GetAttributeCest.php
index 324fff3dc1e..05d0afe471b 100644
--- a/tests/integration/Forms/Element/Numeric/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetAttributesCest.php b/tests/integration/Forms/Element/Numeric/GetAttributesCest.php
index a7a7a1e2d80..03f78498a38 100644
--- a/tests/integration/Forms/Element/Numeric/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetDefaultCest.php b/tests/integration/Forms/Element/Numeric/GetDefaultCest.php
index 60d40a218ea..6aaf95ac47c 100644
--- a/tests/integration/Forms/Element/Numeric/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetFiltersCest.php b/tests/integration/Forms/Element/Numeric/GetFiltersCest.php
index a7ae8ff5444..b177d25ab48 100644
--- a/tests/integration/Forms/Element/Numeric/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetLabelCest.php b/tests/integration/Forms/Element/Numeric/GetLabelCest.php
index f0b28430af1..1bc88d0c5b2 100644
--- a/tests/integration/Forms/Element/Numeric/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetMessagesCest.php b/tests/integration/Forms/Element/Numeric/GetMessagesCest.php
index 78fded323cb..008a53ae713 100644
--- a/tests/integration/Forms/Element/Numeric/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetSetFormCest.php b/tests/integration/Forms/Element/Numeric/GetSetFormCest.php
index d0bf03db1e0..d6433b981df 100644
--- a/tests/integration/Forms/Element/Numeric/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Numeric;
diff --git a/tests/integration/Forms/Element/Numeric/GetSetNameCest.php b/tests/integration/Forms/Element/Numeric/GetSetNameCest.php
index 6590f48e347..5cd5218b220 100644
--- a/tests/integration/Forms/Element/Numeric/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Numeric;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php b/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php
index e8813008892..c7e997d8dcb 100644
--- a/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php b/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php
index bf38593832e..4c933267746 100644
--- a/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php b/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php
index a4361ec1ec6..6f9e5256855 100644
--- a/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/GetValueCest.php b/tests/integration/Forms/Element/Numeric/GetValueCest.php
index 53928633171..e51781bcdd6 100644
--- a/tests/integration/Forms/Element/Numeric/GetValueCest.php
+++ b/tests/integration/Forms/Element/Numeric/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/HasMessagesCest.php b/tests/integration/Forms/Element/Numeric/HasMessagesCest.php
index 5e8999a72e8..8c8f8a99785 100644
--- a/tests/integration/Forms/Element/Numeric/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Numeric/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/LabelCest.php b/tests/integration/Forms/Element/Numeric/LabelCest.php
index 3eaac4433b5..3ce380e4a86 100644
--- a/tests/integration/Forms/Element/Numeric/LabelCest.php
+++ b/tests/integration/Forms/Element/Numeric/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/PrepareAttributesCest.php b/tests/integration/Forms/Element/Numeric/PrepareAttributesCest.php
index 2282fbf1d2d..1f73c040909 100644
--- a/tests/integration/Forms/Element/Numeric/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Numeric/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/RenderCest.php b/tests/integration/Forms/Element/Numeric/RenderCest.php
index ef62596262c..01a167089d4 100644
--- a/tests/integration/Forms/Element/Numeric/RenderCest.php
+++ b/tests/integration/Forms/Element/Numeric/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Numeric;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Numeric/SetAttributeCest.php b/tests/integration/Forms/Element/Numeric/SetAttributeCest.php
index d71eba3f838..a8a2cef6f68 100644
--- a/tests/integration/Forms/Element/Numeric/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetAttributesCest.php b/tests/integration/Forms/Element/Numeric/SetAttributesCest.php
index ed5918ed400..77637e52b15 100644
--- a/tests/integration/Forms/Element/Numeric/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetDefaultCest.php b/tests/integration/Forms/Element/Numeric/SetDefaultCest.php
index cb388bbad7d..5be54d654cb 100644
--- a/tests/integration/Forms/Element/Numeric/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetFiltersCest.php b/tests/integration/Forms/Element/Numeric/SetFiltersCest.php
index 0f8ee32a72d..d3806e3d08d 100644
--- a/tests/integration/Forms/Element/Numeric/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetLabelCest.php b/tests/integration/Forms/Element/Numeric/SetLabelCest.php
index d507abdd6cd..580249ca38b 100644
--- a/tests/integration/Forms/Element/Numeric/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetMessagesCest.php b/tests/integration/Forms/Element/Numeric/SetMessagesCest.php
index 85387001986..4fdf4e26cca 100644
--- a/tests/integration/Forms/Element/Numeric/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php b/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php
index 9dce608ffeb..0d4adcb4c05 100644
--- a/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php b/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php
index 63b0877b005..caf9b5e78b6 100644
--- a/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Numeric/ToStringCest.php b/tests/integration/Forms/Element/Numeric/ToStringCest.php
index cd8141d6144..643d49b93a7 100644
--- a/tests/integration/Forms/Element/Numeric/ToStringCest.php
+++ b/tests/integration/Forms/Element/Numeric/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Numeric;
+namespace Phalcon\Tests\Integration\Forms\Element\Numeric;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Numeric;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Password/AddFilterCest.php b/tests/integration/Forms/Element/Password/AddFilterCest.php
index cb06c8ec2ce..f95976f0b42 100644
--- a/tests/integration/Forms/Element/Password/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Password/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/AddValidatorCest.php b/tests/integration/Forms/Element/Password/AddValidatorCest.php
index f9d857858f0..88e6feebb0b 100644
--- a/tests/integration/Forms/Element/Password/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Password/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/AddValidatorsCest.php b/tests/integration/Forms/Element/Password/AddValidatorsCest.php
index 2e6655c82b8..b637976e68d 100644
--- a/tests/integration/Forms/Element/Password/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Password/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/AppendMessageCest.php b/tests/integration/Forms/Element/Password/AppendMessageCest.php
index 77ed1200b27..ffdf904fa19 100644
--- a/tests/integration/Forms/Element/Password/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Password/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/ClearCest.php b/tests/integration/Forms/Element/Password/ClearCest.php
index d88cf7cd628..872078440e8 100644
--- a/tests/integration/Forms/Element/Password/ClearCest.php
+++ b/tests/integration/Forms/Element/Password/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/ConstructCest.php b/tests/integration/Forms/Element/Password/ConstructCest.php
index 5945d89baa1..0a838b7c9f3 100644
--- a/tests/integration/Forms/Element/Password/ConstructCest.php
+++ b/tests/integration/Forms/Element/Password/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetAttributeCest.php b/tests/integration/Forms/Element/Password/GetAttributeCest.php
index 08d1d3a744f..1b0d4468e45 100644
--- a/tests/integration/Forms/Element/Password/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Password/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetAttributesCest.php b/tests/integration/Forms/Element/Password/GetAttributesCest.php
index 792ef4d1eb6..9bcae9edd35 100644
--- a/tests/integration/Forms/Element/Password/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Password/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetDefaultCest.php b/tests/integration/Forms/Element/Password/GetDefaultCest.php
index cda73c3287c..a965d6314b0 100644
--- a/tests/integration/Forms/Element/Password/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Password/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetFiltersCest.php b/tests/integration/Forms/Element/Password/GetFiltersCest.php
index 37dac82ff5a..2154a58b8cf 100644
--- a/tests/integration/Forms/Element/Password/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Password/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetLabelCest.php b/tests/integration/Forms/Element/Password/GetLabelCest.php
index cc11e439107..58bb085421e 100644
--- a/tests/integration/Forms/Element/Password/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Password/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetMessagesCest.php b/tests/integration/Forms/Element/Password/GetMessagesCest.php
index 56a0ba26497..229aafa0e6a 100644
--- a/tests/integration/Forms/Element/Password/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Password/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetSetFormCest.php b/tests/integration/Forms/Element/Password/GetSetFormCest.php
index b44aa3ce549..9c018c41fcf 100644
--- a/tests/integration/Forms/Element/Password/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Password/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Password;
diff --git a/tests/integration/Forms/Element/Password/GetSetNameCest.php b/tests/integration/Forms/Element/Password/GetSetNameCest.php
index 97f9fecbdc1..c2dff691b1a 100644
--- a/tests/integration/Forms/Element/Password/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Password/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Password;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Password/GetUserOptionCest.php b/tests/integration/Forms/Element/Password/GetUserOptionCest.php
index 35b6ad3060d..23fd8680e15 100644
--- a/tests/integration/Forms/Element/Password/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Password/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetUserOptionsCest.php b/tests/integration/Forms/Element/Password/GetUserOptionsCest.php
index 4f9ac2a3de6..11e00e3d2d1 100644
--- a/tests/integration/Forms/Element/Password/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Password/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetValidatorsCest.php b/tests/integration/Forms/Element/Password/GetValidatorsCest.php
index 9ce09dfd4b0..8768f0ed116 100644
--- a/tests/integration/Forms/Element/Password/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Password/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/GetValueCest.php b/tests/integration/Forms/Element/Password/GetValueCest.php
index f34edb2c124..eabb28d7d32 100644
--- a/tests/integration/Forms/Element/Password/GetValueCest.php
+++ b/tests/integration/Forms/Element/Password/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/HasMessagesCest.php b/tests/integration/Forms/Element/Password/HasMessagesCest.php
index 7e295ab1801..b9d28206fb5 100644
--- a/tests/integration/Forms/Element/Password/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Password/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/LabelCest.php b/tests/integration/Forms/Element/Password/LabelCest.php
index 424c642d422..453f019f5fd 100644
--- a/tests/integration/Forms/Element/Password/LabelCest.php
+++ b/tests/integration/Forms/Element/Password/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/PrepareAttributesCest.php b/tests/integration/Forms/Element/Password/PrepareAttributesCest.php
index a3d72de8ea2..fd3e9011b0a 100644
--- a/tests/integration/Forms/Element/Password/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Password/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/RenderCest.php b/tests/integration/Forms/Element/Password/RenderCest.php
index 3cb423832b6..5e1bc5e55b9 100644
--- a/tests/integration/Forms/Element/Password/RenderCest.php
+++ b/tests/integration/Forms/Element/Password/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Password;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Password/SetAttributeCest.php b/tests/integration/Forms/Element/Password/SetAttributeCest.php
index f5f69073506..f26ef7f69e9 100644
--- a/tests/integration/Forms/Element/Password/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Password/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetAttributesCest.php b/tests/integration/Forms/Element/Password/SetAttributesCest.php
index 9e9806a7a4f..99fdc095afe 100644
--- a/tests/integration/Forms/Element/Password/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Password/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetDefaultCest.php b/tests/integration/Forms/Element/Password/SetDefaultCest.php
index 3114c9caa4e..b52b0f58543 100644
--- a/tests/integration/Forms/Element/Password/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Password/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetFiltersCest.php b/tests/integration/Forms/Element/Password/SetFiltersCest.php
index 711def4ff61..aab035ed70f 100644
--- a/tests/integration/Forms/Element/Password/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Password/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetLabelCest.php b/tests/integration/Forms/Element/Password/SetLabelCest.php
index 1950e8643ae..3aeeee66801 100644
--- a/tests/integration/Forms/Element/Password/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Password/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetMessagesCest.php b/tests/integration/Forms/Element/Password/SetMessagesCest.php
index a497aa7d6ef..ee210ee8155 100644
--- a/tests/integration/Forms/Element/Password/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Password/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetUserOptionCest.php b/tests/integration/Forms/Element/Password/SetUserOptionCest.php
index 18256c7889d..f841b8972d7 100644
--- a/tests/integration/Forms/Element/Password/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Password/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/SetUserOptionsCest.php b/tests/integration/Forms/Element/Password/SetUserOptionsCest.php
index b9ca1a54a85..691cd123308 100644
--- a/tests/integration/Forms/Element/Password/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Password/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Password/ToStringCest.php b/tests/integration/Forms/Element/Password/ToStringCest.php
index de926f57e7c..c49776b6de0 100644
--- a/tests/integration/Forms/Element/Password/ToStringCest.php
+++ b/tests/integration/Forms/Element/Password/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Password;
+namespace Phalcon\Tests\Integration\Forms\Element\Password;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Password;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Radio/AddFilterCest.php b/tests/integration/Forms/Element/Radio/AddFilterCest.php
index 78c61778247..201b115c504 100644
--- a/tests/integration/Forms/Element/Radio/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Radio/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/AddValidatorCest.php b/tests/integration/Forms/Element/Radio/AddValidatorCest.php
index 924d126e2bc..439b8754461 100644
--- a/tests/integration/Forms/Element/Radio/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Radio/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/AddValidatorsCest.php b/tests/integration/Forms/Element/Radio/AddValidatorsCest.php
index 4c4dcc4ed62..450632c7e71 100644
--- a/tests/integration/Forms/Element/Radio/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Radio/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/AppendMessageCest.php b/tests/integration/Forms/Element/Radio/AppendMessageCest.php
index e41ae4fe249..aa24bba4ff4 100644
--- a/tests/integration/Forms/Element/Radio/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Radio/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/ClearCest.php b/tests/integration/Forms/Element/Radio/ClearCest.php
index d137e8b8ef9..a7790791a33 100644
--- a/tests/integration/Forms/Element/Radio/ClearCest.php
+++ b/tests/integration/Forms/Element/Radio/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/ConstructCest.php b/tests/integration/Forms/Element/Radio/ConstructCest.php
index 5682671c6d1..9a79f66aaaf 100644
--- a/tests/integration/Forms/Element/Radio/ConstructCest.php
+++ b/tests/integration/Forms/Element/Radio/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetAttributeCest.php b/tests/integration/Forms/Element/Radio/GetAttributeCest.php
index 846b9dccc3d..af871c18ff9 100644
--- a/tests/integration/Forms/Element/Radio/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Radio/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetAttributesCest.php b/tests/integration/Forms/Element/Radio/GetAttributesCest.php
index 410e4e48210..07b3284b232 100644
--- a/tests/integration/Forms/Element/Radio/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Radio/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetDefaultCest.php b/tests/integration/Forms/Element/Radio/GetDefaultCest.php
index 5b8cdf4e4f1..fb26c5ebb05 100644
--- a/tests/integration/Forms/Element/Radio/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Radio/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetFiltersCest.php b/tests/integration/Forms/Element/Radio/GetFiltersCest.php
index ca71227475f..b6dcc5316b6 100644
--- a/tests/integration/Forms/Element/Radio/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Radio/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetLabelCest.php b/tests/integration/Forms/Element/Radio/GetLabelCest.php
index 495b4393555..c6808b996fa 100644
--- a/tests/integration/Forms/Element/Radio/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Radio/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetMessagesCest.php b/tests/integration/Forms/Element/Radio/GetMessagesCest.php
index f560d6b917f..825851185d2 100644
--- a/tests/integration/Forms/Element/Radio/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Radio/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetSetFormCest.php b/tests/integration/Forms/Element/Radio/GetSetFormCest.php
index 785dbbce531..9a5568df224 100644
--- a/tests/integration/Forms/Element/Radio/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Radio/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Radio;
diff --git a/tests/integration/Forms/Element/Radio/GetSetNameCest.php b/tests/integration/Forms/Element/Radio/GetSetNameCest.php
index 1035dc48242..401c50d1ddf 100644
--- a/tests/integration/Forms/Element/Radio/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Radio/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Radio;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Radio/GetUserOptionCest.php b/tests/integration/Forms/Element/Radio/GetUserOptionCest.php
index 88b36a23c3e..b5bf3897a19 100644
--- a/tests/integration/Forms/Element/Radio/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Radio/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php b/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php
index 41a7e067509..e175f87fc48 100644
--- a/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetValidatorsCest.php b/tests/integration/Forms/Element/Radio/GetValidatorsCest.php
index 2568aec90c4..39614376cf5 100644
--- a/tests/integration/Forms/Element/Radio/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Radio/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/GetValueCest.php b/tests/integration/Forms/Element/Radio/GetValueCest.php
index 16bd10829eb..4801363c7ac 100644
--- a/tests/integration/Forms/Element/Radio/GetValueCest.php
+++ b/tests/integration/Forms/Element/Radio/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/HasMessagesCest.php b/tests/integration/Forms/Element/Radio/HasMessagesCest.php
index 8c87ff3196b..8eb8fa2d61e 100644
--- a/tests/integration/Forms/Element/Radio/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Radio/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/LabelCest.php b/tests/integration/Forms/Element/Radio/LabelCest.php
index 2c1c67453ce..c9320566707 100644
--- a/tests/integration/Forms/Element/Radio/LabelCest.php
+++ b/tests/integration/Forms/Element/Radio/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/PrepareAttributesCest.php b/tests/integration/Forms/Element/Radio/PrepareAttributesCest.php
index 2583aa40c5b..40c7531d09e 100644
--- a/tests/integration/Forms/Element/Radio/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Radio/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/RenderCest.php b/tests/integration/Forms/Element/Radio/RenderCest.php
index 37515e61970..5f14a8a9bdc 100644
--- a/tests/integration/Forms/Element/Radio/RenderCest.php
+++ b/tests/integration/Forms/Element/Radio/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Radio;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Radio/SetAttributeCest.php b/tests/integration/Forms/Element/Radio/SetAttributeCest.php
index d37d07e7693..86e166c30f1 100644
--- a/tests/integration/Forms/Element/Radio/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Radio/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetAttributesCest.php b/tests/integration/Forms/Element/Radio/SetAttributesCest.php
index 96f822ed5a5..87442eb1b9e 100644
--- a/tests/integration/Forms/Element/Radio/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Radio/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetDefaultCest.php b/tests/integration/Forms/Element/Radio/SetDefaultCest.php
index 17f36d3a3e7..5d57a085979 100644
--- a/tests/integration/Forms/Element/Radio/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Radio/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetFiltersCest.php b/tests/integration/Forms/Element/Radio/SetFiltersCest.php
index accc1ebc010..2686346dbe9 100644
--- a/tests/integration/Forms/Element/Radio/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Radio/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetLabelCest.php b/tests/integration/Forms/Element/Radio/SetLabelCest.php
index 5db4b3e1e0f..fd1d253aca3 100644
--- a/tests/integration/Forms/Element/Radio/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Radio/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetMessagesCest.php b/tests/integration/Forms/Element/Radio/SetMessagesCest.php
index e10436efe20..9fb448bbb5e 100644
--- a/tests/integration/Forms/Element/Radio/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Radio/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetUserOptionCest.php b/tests/integration/Forms/Element/Radio/SetUserOptionCest.php
index 727356b40f7..e49233b6fae 100644
--- a/tests/integration/Forms/Element/Radio/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Radio/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php b/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php
index 369f4914d6b..c8c086b538d 100644
--- a/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Radio/ToStringCest.php b/tests/integration/Forms/Element/Radio/ToStringCest.php
index 92744bd502f..e3fd3ec6230 100644
--- a/tests/integration/Forms/Element/Radio/ToStringCest.php
+++ b/tests/integration/Forms/Element/Radio/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Radio;
+namespace Phalcon\Tests\Integration\Forms\Element\Radio;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Radio;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Select/AddFilterCest.php b/tests/integration/Forms/Element/Select/AddFilterCest.php
index f7bd639771d..1eb905a92a2 100644
--- a/tests/integration/Forms/Element/Select/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Select/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/AddOptionCest.php b/tests/integration/Forms/Element/Select/AddOptionCest.php
index d340a9a1310..373dfcfc0a5 100644
--- a/tests/integration/Forms/Element/Select/AddOptionCest.php
+++ b/tests/integration/Forms/Element/Select/AddOptionCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Select;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class AddOptionCest
 {
diff --git a/tests/integration/Forms/Element/Select/AddValidatorCest.php b/tests/integration/Forms/Element/Select/AddValidatorCest.php
index a13e21c703f..3b6b2ba63fc 100644
--- a/tests/integration/Forms/Element/Select/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Select/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/AddValidatorsCest.php b/tests/integration/Forms/Element/Select/AddValidatorsCest.php
index f7c4ca8abe0..9c0ed0f3bcb 100644
--- a/tests/integration/Forms/Element/Select/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Select/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/AppendMessageCest.php b/tests/integration/Forms/Element/Select/AppendMessageCest.php
index c3e4a0f6fb9..180ee7f2938 100644
--- a/tests/integration/Forms/Element/Select/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Select/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/ClearCest.php b/tests/integration/Forms/Element/Select/ClearCest.php
index 25d0536939f..4a6384fb111 100644
--- a/tests/integration/Forms/Element/Select/ClearCest.php
+++ b/tests/integration/Forms/Element/Select/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/ConstructCest.php b/tests/integration/Forms/Element/Select/ConstructCest.php
index d899ba373fe..cbf3f00ca34 100644
--- a/tests/integration/Forms/Element/Select/ConstructCest.php
+++ b/tests/integration/Forms/Element/Select/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetAttributeCest.php b/tests/integration/Forms/Element/Select/GetAttributeCest.php
index 0ad321efc49..21bb82b2d7c 100644
--- a/tests/integration/Forms/Element/Select/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Select/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetAttributesCest.php b/tests/integration/Forms/Element/Select/GetAttributesCest.php
index 44dd9bf84ee..dec998bb19e 100644
--- a/tests/integration/Forms/Element/Select/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Select/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetDefaultCest.php b/tests/integration/Forms/Element/Select/GetDefaultCest.php
index 43eac92956a..34ddb6804fa 100644
--- a/tests/integration/Forms/Element/Select/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Select/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetFiltersCest.php b/tests/integration/Forms/Element/Select/GetFiltersCest.php
index 6ce81fee2ad..e1aa6e6105b 100644
--- a/tests/integration/Forms/Element/Select/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Select/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetLabelCest.php b/tests/integration/Forms/Element/Select/GetLabelCest.php
index 26fd668c2f8..2c03e02f67b 100644
--- a/tests/integration/Forms/Element/Select/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Select/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetMessagesCest.php b/tests/integration/Forms/Element/Select/GetMessagesCest.php
index 48b064e1420..551f26cea0a 100644
--- a/tests/integration/Forms/Element/Select/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Select/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetOptionsCest.php b/tests/integration/Forms/Element/Select/GetOptionsCest.php
index f2f6729c15f..cc349028f16 100644
--- a/tests/integration/Forms/Element/Select/GetOptionsCest.php
+++ b/tests/integration/Forms/Element/Select/GetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetSetFormCest.php b/tests/integration/Forms/Element/Select/GetSetFormCest.php
index 30c69226836..d7b88ba5707 100644
--- a/tests/integration/Forms/Element/Select/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Select/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Select;
diff --git a/tests/integration/Forms/Element/Select/GetSetNameCest.php b/tests/integration/Forms/Element/Select/GetSetNameCest.php
index c0c4053bfa5..a4dd0189337 100644
--- a/tests/integration/Forms/Element/Select/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Select/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Select;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Select/GetUserOptionCest.php b/tests/integration/Forms/Element/Select/GetUserOptionCest.php
index 8299fb58b9b..b469e97d48b 100644
--- a/tests/integration/Forms/Element/Select/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Select/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetUserOptionsCest.php b/tests/integration/Forms/Element/Select/GetUserOptionsCest.php
index e033ebc7936..694aa3a9380 100644
--- a/tests/integration/Forms/Element/Select/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Select/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetValidatorsCest.php b/tests/integration/Forms/Element/Select/GetValidatorsCest.php
index be4debbaaed..51ad5a50609 100644
--- a/tests/integration/Forms/Element/Select/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Select/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/GetValueCest.php b/tests/integration/Forms/Element/Select/GetValueCest.php
index 8bf6772b17b..28769be6501 100644
--- a/tests/integration/Forms/Element/Select/GetValueCest.php
+++ b/tests/integration/Forms/Element/Select/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/HasMessagesCest.php b/tests/integration/Forms/Element/Select/HasMessagesCest.php
index 195eecc7571..15f1dc2703e 100644
--- a/tests/integration/Forms/Element/Select/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Select/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/LabelCest.php b/tests/integration/Forms/Element/Select/LabelCest.php
index 16c42b9a4ed..0b62b96a346 100644
--- a/tests/integration/Forms/Element/Select/LabelCest.php
+++ b/tests/integration/Forms/Element/Select/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/PrepareAttributesCest.php b/tests/integration/Forms/Element/Select/PrepareAttributesCest.php
index 6ae0c5239de..a173c3d1549 100644
--- a/tests/integration/Forms/Element/Select/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Select/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/RenderCest.php b/tests/integration/Forms/Element/Select/RenderCest.php
index e8888de5c5c..749e4ce0faa 100644
--- a/tests/integration/Forms/Element/Select/RenderCest.php
+++ b/tests/integration/Forms/Element/Select/RenderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetAttributeCest.php b/tests/integration/Forms/Element/Select/SetAttributeCest.php
index 57e13ed9992..bd7782a42e2 100644
--- a/tests/integration/Forms/Element/Select/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Select/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetAttributesCest.php b/tests/integration/Forms/Element/Select/SetAttributesCest.php
index 87dc0796e0e..eb50fa0199e 100644
--- a/tests/integration/Forms/Element/Select/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Select/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetDefaultCest.php b/tests/integration/Forms/Element/Select/SetDefaultCest.php
index 1ce50fc44d8..9a559eb0e45 100644
--- a/tests/integration/Forms/Element/Select/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Select/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetFiltersCest.php b/tests/integration/Forms/Element/Select/SetFiltersCest.php
index e7208c87c59..0452ce065a4 100644
--- a/tests/integration/Forms/Element/Select/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Select/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetLabelCest.php b/tests/integration/Forms/Element/Select/SetLabelCest.php
index be63adf3a13..8f4a3ee48fa 100644
--- a/tests/integration/Forms/Element/Select/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Select/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetMessagesCest.php b/tests/integration/Forms/Element/Select/SetMessagesCest.php
index bf62f9f1a27..ae2e0c52df3 100644
--- a/tests/integration/Forms/Element/Select/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Select/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetOptionsCest.php b/tests/integration/Forms/Element/Select/SetOptionsCest.php
index 0d6e1dab783..c731e92c602 100644
--- a/tests/integration/Forms/Element/Select/SetOptionsCest.php
+++ b/tests/integration/Forms/Element/Select/SetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetUserOptionCest.php b/tests/integration/Forms/Element/Select/SetUserOptionCest.php
index 0424d1e043a..b9770b35e5d 100644
--- a/tests/integration/Forms/Element/Select/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Select/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/SetUserOptionsCest.php b/tests/integration/Forms/Element/Select/SetUserOptionsCest.php
index 4104c582c0f..7181b68101d 100644
--- a/tests/integration/Forms/Element/Select/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Select/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Select/ToStringCest.php b/tests/integration/Forms/Element/Select/ToStringCest.php
index 34d928d3089..79b7b3ffb25 100644
--- a/tests/integration/Forms/Element/Select/ToStringCest.php
+++ b/tests/integration/Forms/Element/Select/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Select;
+namespace Phalcon\Tests\Integration\Forms\Element\Select;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/AddFilterCest.php b/tests/integration/Forms/Element/Submit/AddFilterCest.php
index 85f9469f0da..951fa3dff9b 100644
--- a/tests/integration/Forms/Element/Submit/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Submit/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/AddValidatorCest.php b/tests/integration/Forms/Element/Submit/AddValidatorCest.php
index c4121693f4d..3290cb71f51 100644
--- a/tests/integration/Forms/Element/Submit/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Submit/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/AddValidatorsCest.php b/tests/integration/Forms/Element/Submit/AddValidatorsCest.php
index e8b7bf973d7..58bddb2f760 100644
--- a/tests/integration/Forms/Element/Submit/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Submit/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/AppendMessageCest.php b/tests/integration/Forms/Element/Submit/AppendMessageCest.php
index 7dab02722f9..d2ac2fdd018 100644
--- a/tests/integration/Forms/Element/Submit/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Submit/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/ClearCest.php b/tests/integration/Forms/Element/Submit/ClearCest.php
index be512e9e1f6..c46efa0caa3 100644
--- a/tests/integration/Forms/Element/Submit/ClearCest.php
+++ b/tests/integration/Forms/Element/Submit/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/ConstructCest.php b/tests/integration/Forms/Element/Submit/ConstructCest.php
index 30c5b9dd83a..820509cf265 100644
--- a/tests/integration/Forms/Element/Submit/ConstructCest.php
+++ b/tests/integration/Forms/Element/Submit/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetAttributeCest.php b/tests/integration/Forms/Element/Submit/GetAttributeCest.php
index 1f1bf8af171..8729909801c 100644
--- a/tests/integration/Forms/Element/Submit/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Submit/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetAttributesCest.php b/tests/integration/Forms/Element/Submit/GetAttributesCest.php
index d2647db4ec6..11f488771e5 100644
--- a/tests/integration/Forms/Element/Submit/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Submit/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetDefaultCest.php b/tests/integration/Forms/Element/Submit/GetDefaultCest.php
index 5ce31b31ddd..d7e174559cf 100644
--- a/tests/integration/Forms/Element/Submit/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Submit/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetFiltersCest.php b/tests/integration/Forms/Element/Submit/GetFiltersCest.php
index 1c82e3277bd..a3dd2bd7918 100644
--- a/tests/integration/Forms/Element/Submit/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Submit/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetLabelCest.php b/tests/integration/Forms/Element/Submit/GetLabelCest.php
index 1cefb518151..6a6782080ba 100644
--- a/tests/integration/Forms/Element/Submit/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Submit/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetMessagesCest.php b/tests/integration/Forms/Element/Submit/GetMessagesCest.php
index 0acd6954593..93958c1a408 100644
--- a/tests/integration/Forms/Element/Submit/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Submit/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetSetFormCest.php b/tests/integration/Forms/Element/Submit/GetSetFormCest.php
index 7c7be9eb3c2..90a2c38dd3b 100644
--- a/tests/integration/Forms/Element/Submit/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Submit/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Submit;
diff --git a/tests/integration/Forms/Element/Submit/GetSetNameCest.php b/tests/integration/Forms/Element/Submit/GetSetNameCest.php
index 82f230a17f8..608c2f6dbab 100644
--- a/tests/integration/Forms/Element/Submit/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Submit/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Submit;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Submit/GetUserOptionCest.php b/tests/integration/Forms/Element/Submit/GetUserOptionCest.php
index fb54543aafc..f88980d08d1 100644
--- a/tests/integration/Forms/Element/Submit/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Submit/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php b/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php
index 86590c2ec33..c32c3a8aa5b 100644
--- a/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetValidatorsCest.php b/tests/integration/Forms/Element/Submit/GetValidatorsCest.php
index 6d9f21ab635..cdeb2f45b9e 100644
--- a/tests/integration/Forms/Element/Submit/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Submit/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/GetValueCest.php b/tests/integration/Forms/Element/Submit/GetValueCest.php
index c60b5fb1b97..f00f7da1f3d 100644
--- a/tests/integration/Forms/Element/Submit/GetValueCest.php
+++ b/tests/integration/Forms/Element/Submit/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/HasMessagesCest.php b/tests/integration/Forms/Element/Submit/HasMessagesCest.php
index d6ecacc28b7..2b8b4422adb 100644
--- a/tests/integration/Forms/Element/Submit/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Submit/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/LabelCest.php b/tests/integration/Forms/Element/Submit/LabelCest.php
index 9a2be82a6d7..92ec011fc7c 100644
--- a/tests/integration/Forms/Element/Submit/LabelCest.php
+++ b/tests/integration/Forms/Element/Submit/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/PrepareAttributesCest.php b/tests/integration/Forms/Element/Submit/PrepareAttributesCest.php
index c15b1d45181..6f66ae698fb 100644
--- a/tests/integration/Forms/Element/Submit/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Submit/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/RenderCest.php b/tests/integration/Forms/Element/Submit/RenderCest.php
index 782cea22a2b..34cdf9f7044 100644
--- a/tests/integration/Forms/Element/Submit/RenderCest.php
+++ b/tests/integration/Forms/Element/Submit/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Submit;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Submit/SetAttributeCest.php b/tests/integration/Forms/Element/Submit/SetAttributeCest.php
index 708b6f3ca19..61be9b00a97 100644
--- a/tests/integration/Forms/Element/Submit/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Submit/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetAttributesCest.php b/tests/integration/Forms/Element/Submit/SetAttributesCest.php
index 3cb5ae331f8..c6b787fe514 100644
--- a/tests/integration/Forms/Element/Submit/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Submit/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetDefaultCest.php b/tests/integration/Forms/Element/Submit/SetDefaultCest.php
index 24a1edd8850..a6391a17d8f 100644
--- a/tests/integration/Forms/Element/Submit/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Submit/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetFiltersCest.php b/tests/integration/Forms/Element/Submit/SetFiltersCest.php
index 2821b0b2baa..c172f2c68c1 100644
--- a/tests/integration/Forms/Element/Submit/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Submit/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetLabelCest.php b/tests/integration/Forms/Element/Submit/SetLabelCest.php
index 73cbd194e42..40422858043 100644
--- a/tests/integration/Forms/Element/Submit/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Submit/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetMessagesCest.php b/tests/integration/Forms/Element/Submit/SetMessagesCest.php
index e022ab3e8bb..7970f426da6 100644
--- a/tests/integration/Forms/Element/Submit/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Submit/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetUserOptionCest.php b/tests/integration/Forms/Element/Submit/SetUserOptionCest.php
index bc454e5b5dd..f00951d0d5b 100644
--- a/tests/integration/Forms/Element/Submit/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Submit/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php b/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php
index aff23c93c71..cb65137b454 100644
--- a/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Submit/ToStringCest.php b/tests/integration/Forms/Element/Submit/ToStringCest.php
index 6940c68a3da..4837e013cce 100644
--- a/tests/integration/Forms/Element/Submit/ToStringCest.php
+++ b/tests/integration/Forms/Element/Submit/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Submit;
+namespace Phalcon\Tests\Integration\Forms\Element\Submit;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Submit;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/Text/AddFilterCest.php b/tests/integration/Forms/Element/Text/AddFilterCest.php
index 391b579d447..a5e7612d1b9 100644
--- a/tests/integration/Forms/Element/Text/AddFilterCest.php
+++ b/tests/integration/Forms/Element/Text/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/AddValidatorCest.php b/tests/integration/Forms/Element/Text/AddValidatorCest.php
index 7a6fe2f8acd..3143eba3155 100644
--- a/tests/integration/Forms/Element/Text/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/Text/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/AddValidatorsCest.php b/tests/integration/Forms/Element/Text/AddValidatorsCest.php
index 7cee2371df4..27f519d2e36 100644
--- a/tests/integration/Forms/Element/Text/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/Text/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/AppendMessageCest.php b/tests/integration/Forms/Element/Text/AppendMessageCest.php
index 48c6976321f..8fda904cb22 100644
--- a/tests/integration/Forms/Element/Text/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/Text/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/ClearCest.php b/tests/integration/Forms/Element/Text/ClearCest.php
index 8320c5f0b26..6304e3ec38e 100644
--- a/tests/integration/Forms/Element/Text/ClearCest.php
+++ b/tests/integration/Forms/Element/Text/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/ConstructCest.php b/tests/integration/Forms/Element/Text/ConstructCest.php
index e4c4628d2d2..16a76dc343b 100644
--- a/tests/integration/Forms/Element/Text/ConstructCest.php
+++ b/tests/integration/Forms/Element/Text/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetAttributeCest.php b/tests/integration/Forms/Element/Text/GetAttributeCest.php
index 28fd1d973b5..1714c67e107 100644
--- a/tests/integration/Forms/Element/Text/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/Text/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetAttributesCest.php b/tests/integration/Forms/Element/Text/GetAttributesCest.php
index acc566374c1..4f53810ab49 100644
--- a/tests/integration/Forms/Element/Text/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/Text/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetDefaultCest.php b/tests/integration/Forms/Element/Text/GetDefaultCest.php
index 99d842ad9a6..83a0771f085 100644
--- a/tests/integration/Forms/Element/Text/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/Text/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetFiltersCest.php b/tests/integration/Forms/Element/Text/GetFiltersCest.php
index 46e5d169a36..031c087f195 100644
--- a/tests/integration/Forms/Element/Text/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/Text/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetLabelCest.php b/tests/integration/Forms/Element/Text/GetLabelCest.php
index f7f21dadcfe..5d01d169967 100644
--- a/tests/integration/Forms/Element/Text/GetLabelCest.php
+++ b/tests/integration/Forms/Element/Text/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetMessagesCest.php b/tests/integration/Forms/Element/Text/GetMessagesCest.php
index 630e62c75ef..7cf762704b0 100644
--- a/tests/integration/Forms/Element/Text/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/Text/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetSetFormCest.php b/tests/integration/Forms/Element/Text/GetSetFormCest.php
index 3df13754dcb..007de96ba6d 100644
--- a/tests/integration/Forms/Element/Text/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/Text/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Element/Text/GetSetNameCest.php b/tests/integration/Forms/Element/Text/GetSetNameCest.php
index 550b1f165d9..808abac3735 100644
--- a/tests/integration/Forms/Element/Text/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/Text/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/Text/GetUserOptionCest.php b/tests/integration/Forms/Element/Text/GetUserOptionCest.php
index c8de8dcb1c8..d8e587824d4 100644
--- a/tests/integration/Forms/Element/Text/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Text/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetUserOptionsCest.php b/tests/integration/Forms/Element/Text/GetUserOptionsCest.php
index 06644410abb..2200cf05779 100644
--- a/tests/integration/Forms/Element/Text/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Text/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetValidatorsCest.php b/tests/integration/Forms/Element/Text/GetValidatorsCest.php
index b7b5aaeb14a..6e8ad26678c 100644
--- a/tests/integration/Forms/Element/Text/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/Text/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/GetValueCest.php b/tests/integration/Forms/Element/Text/GetValueCest.php
index 034a4f76bba..2ded191eb11 100644
--- a/tests/integration/Forms/Element/Text/GetValueCest.php
+++ b/tests/integration/Forms/Element/Text/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/HasMessagesCest.php b/tests/integration/Forms/Element/Text/HasMessagesCest.php
index ccb0c0c31bf..abc0bc35008 100644
--- a/tests/integration/Forms/Element/Text/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/Text/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/LabelCest.php b/tests/integration/Forms/Element/Text/LabelCest.php
index b31e752cb62..fe2a4f60202 100644
--- a/tests/integration/Forms/Element/Text/LabelCest.php
+++ b/tests/integration/Forms/Element/Text/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/PrepareAttributesCest.php b/tests/integration/Forms/Element/Text/PrepareAttributesCest.php
index de0bd30090b..d29da807628 100644
--- a/tests/integration/Forms/Element/Text/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/Text/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/RenderCest.php b/tests/integration/Forms/Element/Text/RenderCest.php
index 18b186a802f..2a1718f8745 100644
--- a/tests/integration/Forms/Element/Text/RenderCest.php
+++ b/tests/integration/Forms/Element/Text/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/Text/SetAttributeCest.php b/tests/integration/Forms/Element/Text/SetAttributeCest.php
index e816cc438ce..9db0d6a5a10 100644
--- a/tests/integration/Forms/Element/Text/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/Text/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/SetAttributesCest.php b/tests/integration/Forms/Element/Text/SetAttributesCest.php
index 6e876c97345..8b7c2362e17 100644
--- a/tests/integration/Forms/Element/Text/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/Text/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/SetDefaultCest.php b/tests/integration/Forms/Element/Text/SetDefaultCest.php
index 51803df252f..2cbf3ba7507 100644
--- a/tests/integration/Forms/Element/Text/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/Text/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/SetFiltersCest.php b/tests/integration/Forms/Element/Text/SetFiltersCest.php
index e2682bfc8c1..d6043a77a3f 100644
--- a/tests/integration/Forms/Element/Text/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/Text/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/SetLabelCest.php b/tests/integration/Forms/Element/Text/SetLabelCest.php
index 99bf21823c6..57cdb830583 100644
--- a/tests/integration/Forms/Element/Text/SetLabelCest.php
+++ b/tests/integration/Forms/Element/Text/SetLabelCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class SetLabelCest
 {
diff --git a/tests/integration/Forms/Element/Text/SetMessagesCest.php b/tests/integration/Forms/Element/Text/SetMessagesCest.php
index 16e730c3c33..7d1030f1556 100644
--- a/tests/integration/Forms/Element/Text/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/Text/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/SetUserOptionCest.php b/tests/integration/Forms/Element/Text/SetUserOptionCest.php
index 42420760819..98ad32df732 100644
--- a/tests/integration/Forms/Element/Text/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/Text/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/SetUserOptionsCest.php b/tests/integration/Forms/Element/Text/SetUserOptionsCest.php
index 9c8a82f918f..9aa0f3c63cd 100644
--- a/tests/integration/Forms/Element/Text/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/Text/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Text/ToStringCest.php b/tests/integration/Forms/Element/Text/ToStringCest.php
index 8c2af96d969..c84d7342527 100644
--- a/tests/integration/Forms/Element/Text/ToStringCest.php
+++ b/tests/integration/Forms/Element/Text/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\Text;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/TextArea/AddFilterCest.php b/tests/integration/Forms/Element/TextArea/AddFilterCest.php
index f1b7687f033..8df90cc30ac 100644
--- a/tests/integration/Forms/Element/TextArea/AddFilterCest.php
+++ b/tests/integration/Forms/Element/TextArea/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/AddValidatorCest.php b/tests/integration/Forms/Element/TextArea/AddValidatorCest.php
index 731b9d6d3a1..7597fecc1d7 100644
--- a/tests/integration/Forms/Element/TextArea/AddValidatorCest.php
+++ b/tests/integration/Forms/Element/TextArea/AddValidatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php b/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php
index 23fe76f0b2f..d31e7d0d735 100644
--- a/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php
+++ b/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/AppendMessageCest.php b/tests/integration/Forms/Element/TextArea/AppendMessageCest.php
index 4eaafe0c73a..52b4b1d8f31 100644
--- a/tests/integration/Forms/Element/TextArea/AppendMessageCest.php
+++ b/tests/integration/Forms/Element/TextArea/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/ClearCest.php b/tests/integration/Forms/Element/TextArea/ClearCest.php
index dd63e01a79e..e3159b3cd9e 100644
--- a/tests/integration/Forms/Element/TextArea/ClearCest.php
+++ b/tests/integration/Forms/Element/TextArea/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/ConstructCest.php b/tests/integration/Forms/Element/TextArea/ConstructCest.php
index c44966e5504..39bb2ed18ec 100644
--- a/tests/integration/Forms/Element/TextArea/ConstructCest.php
+++ b/tests/integration/Forms/Element/TextArea/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetAttributeCest.php b/tests/integration/Forms/Element/TextArea/GetAttributeCest.php
index 9228047537b..9b9dacd9c94 100644
--- a/tests/integration/Forms/Element/TextArea/GetAttributeCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetAttributesCest.php b/tests/integration/Forms/Element/TextArea/GetAttributesCest.php
index 383c08fcfd6..ca1a16729bc 100644
--- a/tests/integration/Forms/Element/TextArea/GetAttributesCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetDefaultCest.php b/tests/integration/Forms/Element/TextArea/GetDefaultCest.php
index f526ae74a02..657c16f60bd 100644
--- a/tests/integration/Forms/Element/TextArea/GetDefaultCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetFiltersCest.php b/tests/integration/Forms/Element/TextArea/GetFiltersCest.php
index c2dc0ff1ec9..9bf683fc138 100644
--- a/tests/integration/Forms/Element/TextArea/GetFiltersCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetLabelCest.php b/tests/integration/Forms/Element/TextArea/GetLabelCest.php
index 8862ca68bba..a11a65aae10 100644
--- a/tests/integration/Forms/Element/TextArea/GetLabelCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetMessagesCest.php b/tests/integration/Forms/Element/TextArea/GetMessagesCest.php
index 5f9fcc19d02..4483ace79d0 100644
--- a/tests/integration/Forms/Element/TextArea/GetMessagesCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetSetFormCest.php b/tests/integration/Forms/Element/TextArea/GetSetFormCest.php
index 526a74c17b7..eaae4d43e4e 100644
--- a/tests/integration/Forms/Element/TextArea/GetSetFormCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetSetFormCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\TextArea;
diff --git a/tests/integration/Forms/Element/TextArea/GetSetNameCest.php b/tests/integration/Forms/Element/TextArea/GetSetNameCest.php
index 3b88b0a799d..4367459a039 100644
--- a/tests/integration/Forms/Element/TextArea/GetSetNameCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetSetNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\TextArea;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetNameCest
 {
diff --git a/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php b/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php
index e32c6c2753d..2c52cf40956 100644
--- a/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php b/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php
index f830834b1a6..9c78df5f168 100644
--- a/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php b/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php
index 990e0c8f0c4..7cf0761f61a 100644
--- a/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/GetValueCest.php b/tests/integration/Forms/Element/TextArea/GetValueCest.php
index 7c526c945da..68780fe4e6d 100644
--- a/tests/integration/Forms/Element/TextArea/GetValueCest.php
+++ b/tests/integration/Forms/Element/TextArea/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/HasMessagesCest.php b/tests/integration/Forms/Element/TextArea/HasMessagesCest.php
index 83e51289123..dd82efe7911 100644
--- a/tests/integration/Forms/Element/TextArea/HasMessagesCest.php
+++ b/tests/integration/Forms/Element/TextArea/HasMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/LabelCest.php b/tests/integration/Forms/Element/TextArea/LabelCest.php
index 9ac5586ea7d..b18b5608115 100644
--- a/tests/integration/Forms/Element/TextArea/LabelCest.php
+++ b/tests/integration/Forms/Element/TextArea/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/PrepareAttributesCest.php b/tests/integration/Forms/Element/TextArea/PrepareAttributesCest.php
index 0a60116cae8..e36d02ee5df 100644
--- a/tests/integration/Forms/Element/TextArea/PrepareAttributesCest.php
+++ b/tests/integration/Forms/Element/TextArea/PrepareAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/RenderCest.php b/tests/integration/Forms/Element/TextArea/RenderCest.php
index 5b7d23cddee..d1be86c6d69 100644
--- a/tests/integration/Forms/Element/TextArea/RenderCest.php
+++ b/tests/integration/Forms/Element/TextArea/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\TextArea;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Forms/Element/TextArea/SetAttributeCest.php b/tests/integration/Forms/Element/TextArea/SetAttributeCest.php
index ac832f54530..ecd02ae7933 100644
--- a/tests/integration/Forms/Element/TextArea/SetAttributeCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetAttributesCest.php b/tests/integration/Forms/Element/TextArea/SetAttributesCest.php
index 04ab2c7cb0d..175f0bb67f4 100644
--- a/tests/integration/Forms/Element/TextArea/SetAttributesCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetDefaultCest.php b/tests/integration/Forms/Element/TextArea/SetDefaultCest.php
index 6bbfd2f9798..b970069c2bc 100644
--- a/tests/integration/Forms/Element/TextArea/SetDefaultCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetFiltersCest.php b/tests/integration/Forms/Element/TextArea/SetFiltersCest.php
index afcc5ad6bcc..bd70687fde4 100644
--- a/tests/integration/Forms/Element/TextArea/SetFiltersCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetLabelCest.php b/tests/integration/Forms/Element/TextArea/SetLabelCest.php
index 66c4fd666ce..5f8ff363988 100644
--- a/tests/integration/Forms/Element/TextArea/SetLabelCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetMessagesCest.php b/tests/integration/Forms/Element/TextArea/SetMessagesCest.php
index dfc1c2427f5..c7dd27b562e 100644
--- a/tests/integration/Forms/Element/TextArea/SetMessagesCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php b/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php
index 2d3e35781b9..f4159f0b1a4 100644
--- a/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php b/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php
index 3b7fbc0b7f4..c3275094c7c 100644
--- a/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/TextArea/ToStringCest.php b/tests/integration/Forms/Element/TextArea/ToStringCest.php
index 044a0ff18fd..52046843560 100644
--- a/tests/integration/Forms/Element/TextArea/ToStringCest.php
+++ b/tests/integration/Forms/Element/TextArea/ToStringCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\TextArea;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ToStringCest
 {
diff --git a/tests/integration/Forms/Element/TextCest.php b/tests/integration/Forms/Element/TextCest.php
index 90e8f3aaeb3..0e76167aaf5 100644
--- a/tests/integration/Forms/Element/TextCest.php
+++ b/tests/integration/Forms/Element/TextCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Forms\Element;
+namespace Phalcon\Tests\Integration\Forms\Element;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class TextCest
 {
diff --git a/tests/integration/Forms/Form/AddCest.php b/tests/integration/Forms/Form/AddCest.php
index 61888e77065..fec541ff397 100644
--- a/tests/integration/Forms/Form/AddCest.php
+++ b/tests/integration/Forms/Form/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Form/BindCest.php b/tests/integration/Forms/Form/BindCest.php
index 0bc031d0660..3c53ef381f9 100644
--- a/tests/integration/Forms/Form/BindCest.php
+++ b/tests/integration/Forms/Form/BindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Form/ConstructCest.php b/tests/integration/Forms/Form/ConstructCest.php
index 7bfb8ef1504..9b8205bbc2e 100644
--- a/tests/integration/Forms/Form/ConstructCest.php
+++ b/tests/integration/Forms/Form/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/CountCest.php b/tests/integration/Forms/Form/CountCest.php
index 26a466dc8d3..07514353bd8 100644
--- a/tests/integration/Forms/Form/CountCest.php
+++ b/tests/integration/Forms/Form/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Form/GetAttributesCest.php b/tests/integration/Forms/Form/GetAttributesCest.php
index 40a12051063..e56fd80ae41 100644
--- a/tests/integration/Forms/Form/GetAttributesCest.php
+++ b/tests/integration/Forms/Form/GetAttributesCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
 use Phalcon\Html\Attributes\AttributesInterface;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetAttributesCest
 {
diff --git a/tests/integration/Forms/Form/GetCest.php b/tests/integration/Forms/Form/GetCest.php
index 130fb4e9522..9f558d090cc 100644
--- a/tests/integration/Forms/Form/GetCest.php
+++ b/tests/integration/Forms/Form/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Form/GetDICest.php b/tests/integration/Forms/Form/GetDICest.php
index 0100e1f532a..e86dc5cf98e 100644
--- a/tests/integration/Forms/Form/GetDICest.php
+++ b/tests/integration/Forms/Form/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/GetElementsCest.php b/tests/integration/Forms/Form/GetElementsCest.php
index 474624f51d8..b5db941ea09 100644
--- a/tests/integration/Forms/Form/GetElementsCest.php
+++ b/tests/integration/Forms/Form/GetElementsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Form/GetEntityCest.php b/tests/integration/Forms/Form/GetEntityCest.php
index 1811423583e..191e518d84c 100644
--- a/tests/integration/Forms/Form/GetEntityCest.php
+++ b/tests/integration/Forms/Form/GetEntityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/GetEventsManagerCest.php b/tests/integration/Forms/Form/GetEventsManagerCest.php
index 02ad39a4f01..412ae5499c6 100644
--- a/tests/integration/Forms/Form/GetEventsManagerCest.php
+++ b/tests/integration/Forms/Form/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/GetLabelCest.php b/tests/integration/Forms/Form/GetLabelCest.php
index 4e51f05b25b..e7e9469db37 100644
--- a/tests/integration/Forms/Form/GetLabelCest.php
+++ b/tests/integration/Forms/Form/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/GetMessagesCest.php b/tests/integration/Forms/Form/GetMessagesCest.php
index 429310f44b5..1767c5b06f0 100644
--- a/tests/integration/Forms/Form/GetMessagesCest.php
+++ b/tests/integration/Forms/Form/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
@@ -19,7 +19,7 @@
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Validation;
 use Phalcon\Validation\Validator\PresenceOf;
 use Phalcon\Validation\Validator\Regex;
diff --git a/tests/integration/Forms/Form/GetMessagesForCest.php b/tests/integration/Forms/Form/GetMessagesForCest.php
index 5943edb885a..4fc3ab16993 100644
--- a/tests/integration/Forms/Form/GetMessagesForCest.php
+++ b/tests/integration/Forms/Form/GetMessagesForCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/GetSetActionCest.php b/tests/integration/Forms/Form/GetSetActionCest.php
index bfe7d01dcae..482efa5e0be 100644
--- a/tests/integration/Forms/Form/GetSetActionCest.php
+++ b/tests/integration/Forms/Form/GetSetActionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
-use Phalcon\Test\Fixtures\Forms\SetActionForm;
+use Phalcon\Tests\Fixtures\Forms\SetActionForm;
 
 class GetSetActionCest
 {
diff --git a/tests/integration/Forms/Form/GetUserOptionCest.php b/tests/integration/Forms/Form/GetUserOptionCest.php
index 4139997d73b..6639bcea737 100644
--- a/tests/integration/Forms/Form/GetUserOptionCest.php
+++ b/tests/integration/Forms/Form/GetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/GetUserOptionsCest.php b/tests/integration/Forms/Form/GetUserOptionsCest.php
index c641d4b5d2c..4aba75a886d 100644
--- a/tests/integration/Forms/Form/GetUserOptionsCest.php
+++ b/tests/integration/Forms/Form/GetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/GetValidationCest.php b/tests/integration/Forms/Form/GetValidationCest.php
index 61ba9646d53..3e9e3a35de8 100644
--- a/tests/integration/Forms/Form/GetValidationCest.php
+++ b/tests/integration/Forms/Form/GetValidationCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/GetValueCest.php b/tests/integration/Forms/Form/GetValueCest.php
index dca22a68396..4e39459ee27 100644
--- a/tests/integration/Forms/Form/GetValueCest.php
+++ b/tests/integration/Forms/Form/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/HasCest.php b/tests/integration/Forms/Form/HasCest.php
index babd3e4ab3c..1d56a9f9ef0 100644
--- a/tests/integration/Forms/Form/HasCest.php
+++ b/tests/integration/Forms/Form/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
diff --git a/tests/integration/Forms/Form/HasMessagesForCest.php b/tests/integration/Forms/Form/HasMessagesForCest.php
index 67b48e72bf9..defd1ba8fb0 100644
--- a/tests/integration/Forms/Form/HasMessagesForCest.php
+++ b/tests/integration/Forms/Form/HasMessagesForCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
@@ -19,7 +19,7 @@
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Validation\Validator\Regex;
 
 class HasMessagesForCest
diff --git a/tests/integration/Forms/Form/IsValidCest.php b/tests/integration/Forms/Form/IsValidCest.php
index 3d4b426be8a..304866e7962 100644
--- a/tests/integration/Forms/Form/IsValidCest.php
+++ b/tests/integration/Forms/Form/IsValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
@@ -19,8 +19,8 @@
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Forms\ValidationForm;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Forms\ValidationForm;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Validation;
 use Phalcon\Validation\Validator\PresenceOf;
 use Phalcon\Validation\Validator\Regex;
diff --git a/tests/integration/Forms/Form/IteratorCest.php b/tests/integration/Forms/Form/IteratorCest.php
index 4e9d3196793..7933b8f3cba 100644
--- a/tests/integration/Forms/Form/IteratorCest.php
+++ b/tests/integration/Forms/Form/IteratorCest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Form;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class IteratorCest
 {
diff --git a/tests/integration/Forms/Form/LabelCest.php b/tests/integration/Forms/Form/LabelCest.php
index fd751f27fb9..8644dda8909 100644
--- a/tests/integration/Forms/Form/LabelCest.php
+++ b/tests/integration/Forms/Form/LabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/RemoveCest.php b/tests/integration/Forms/Form/RemoveCest.php
index ca2f0e0059f..a53a9e2a86c 100644
--- a/tests/integration/Forms/Form/RemoveCest.php
+++ b/tests/integration/Forms/Form/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/RenderCest.php b/tests/integration/Forms/Form/RenderCest.php
index fb165ec59cc..13eaf40ba2e 100644
--- a/tests/integration/Forms/Form/RenderCest.php
+++ b/tests/integration/Forms/Form/RenderCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Form;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use stdClass;
 
 class RenderCest
diff --git a/tests/integration/Forms/Form/SetAttributesCest.php b/tests/integration/Forms/Form/SetAttributesCest.php
index 1964cc74aab..0c6884632a0 100644
--- a/tests/integration/Forms/Form/SetAttributesCest.php
+++ b/tests/integration/Forms/Form/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/SetDICest.php b/tests/integration/Forms/Form/SetDICest.php
index 22e735e4b8b..4ea72d8c26a 100644
--- a/tests/integration/Forms/Form/SetDICest.php
+++ b/tests/integration/Forms/Form/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/SetEntityCest.php b/tests/integration/Forms/Form/SetEntityCest.php
index 49d39548e65..dfd4a6e77ba 100644
--- a/tests/integration/Forms/Form/SetEntityCest.php
+++ b/tests/integration/Forms/Form/SetEntityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/SetEventsManagerCest.php b/tests/integration/Forms/Form/SetEventsManagerCest.php
index 43bfce5e3ce..6ae3d750fd4 100644
--- a/tests/integration/Forms/Form/SetEventsManagerCest.php
+++ b/tests/integration/Forms/Form/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Form/SetUserOptionCest.php b/tests/integration/Forms/Form/SetUserOptionCest.php
index 7fb9a53d5f6..528cd4aadd2 100644
--- a/tests/integration/Forms/Form/SetUserOptionCest.php
+++ b/tests/integration/Forms/Form/SetUserOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/SetUserOptionsCest.php b/tests/integration/Forms/Form/SetUserOptionsCest.php
index 721e9124119..3d727c64999 100644
--- a/tests/integration/Forms/Form/SetUserOptionsCest.php
+++ b/tests/integration/Forms/Form/SetUserOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Form/SetValidationCest.php b/tests/integration/Forms/Form/SetValidationCest.php
index 42e7962f2c1..454c46a3816 100644
--- a/tests/integration/Forms/Form/SetValidationCest.php
+++ b/tests/integration/Forms/Form/SetValidationCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
@@ -19,7 +19,7 @@
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Validation;
 use Phalcon\Validation\Validator\Regex;
 
diff --git a/tests/integration/Forms/Form/UnderscoreGetCest.php b/tests/integration/Forms/Form/UnderscoreGetCest.php
index 3b18d264bf7..5b86b7723d5 100644
--- a/tests/integration/Forms/Form/UnderscoreGetCest.php
+++ b/tests/integration/Forms/Form/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Manager/CreateCest.php b/tests/integration/Forms/Manager/CreateCest.php
index ed008bb8925..ebf11b8e3e8 100644
--- a/tests/integration/Forms/Manager/CreateCest.php
+++ b/tests/integration/Forms/Manager/CreateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Manager;
+namespace Phalcon\Tests\Integration\Forms\Manager;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Forms/Manager/GetSetCest.php b/tests/integration/Forms/Manager/GetSetCest.php
index 6f59f403ca7..202dea5af54 100644
--- a/tests/integration/Forms/Manager/GetSetCest.php
+++ b/tests/integration/Forms/Manager/GetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Manager;
+namespace Phalcon\Tests\Integration\Forms\Manager;
 
 use IntegrationTester;
 use Phalcon\Forms\Exception;
diff --git a/tests/integration/Forms/Manager/HasCest.php b/tests/integration/Forms/Manager/HasCest.php
index 3448bacfda0..dce1beece4e 100644
--- a/tests/integration/Forms/Manager/HasCest.php
+++ b/tests/integration/Forms/Manager/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Manager;
+namespace Phalcon\Tests\Integration\Forms\Manager;
 
 use IntegrationTester;
 use Phalcon\Forms\Form;
diff --git a/tests/integration/Image/ImageFactory/LoadCest.php b/tests/integration/Image/ImageFactory/LoadCest.php
index 979a2b37e82..10733fe6599 100644
--- a/tests/integration/Image/ImageFactory/LoadCest.php
+++ b/tests/integration/Image/ImageFactory/LoadCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Image\ImageFactory;
+namespace Phalcon\Tests\Integration\Image\ImageFactory;
 
 use IntegrationTester;
 use Phalcon\Image\Adapter\Imagick;
 use Phalcon\Image\ImageFactory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 
 class LoadCest
 {
diff --git a/tests/integration/Mvc/Application/ConstructCest.php b/tests/integration/Mvc/Application/ConstructCest.php
index 1b874c1aaa9..3debdecabee 100644
--- a/tests/integration/Mvc/Application/ConstructCest.php
+++ b/tests/integration/Mvc/Application/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/GetDefaultModuleCest.php b/tests/integration/Mvc/Application/GetDefaultModuleCest.php
index c329eb70ec1..5c854bd724b 100644
--- a/tests/integration/Mvc/Application/GetDefaultModuleCest.php
+++ b/tests/integration/Mvc/Application/GetDefaultModuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/GetEventsManagerCest.php b/tests/integration/Mvc/Application/GetEventsManagerCest.php
index 2323347703f..a46b1b1e75b 100644
--- a/tests/integration/Mvc/Application/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/Application/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/GetModuleCest.php b/tests/integration/Mvc/Application/GetModuleCest.php
index a4d405c88f7..4a048ed2877 100644
--- a/tests/integration/Mvc/Application/GetModuleCest.php
+++ b/tests/integration/Mvc/Application/GetModuleCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 use Phalcon\Application\Exception;
 use Phalcon\Mvc\Application;
-use Phalcon\Test\Modules\Frontend\Module;
+use Phalcon\Tests\Modules\Frontend\Module;
 
 class GetModuleCest
 {
@@ -41,7 +41,7 @@ public function mvcApplicationGetModule(IntegrationTester $I)
                 'path'      => dataDir('fixtures/modules/frontend/Module.php'),
             ],
             'backend'  => [
-                'className' => \Phalcon\Test\Modules\Backend\Module::class,
+                'className' => \Phalcon\Tests\Modules\Backend\Module::class,
                 'path'      => dataDir('fixtures/modules/backend/Module.php'),
             ],
         ];
diff --git a/tests/integration/Mvc/Application/GetModulesCest.php b/tests/integration/Mvc/Application/GetModulesCest.php
index 4e0cf305082..e459e2f085c 100644
--- a/tests/integration/Mvc/Application/GetModulesCest.php
+++ b/tests/integration/Mvc/Application/GetModulesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 use Phalcon\Mvc\Application;
-use Phalcon\Test\Modules\Frontend\Module;
+use Phalcon\Tests\Modules\Frontend\Module;
 
 class GetModulesCest
 {
@@ -61,7 +61,7 @@ public function mvcApplicationGetModules(IntegrationTester $I)
                 'path'      => dataDir('fixtures/modules/frontend/Module.php'),
             ],
             'backend'  => [
-                'className' => \Phalcon\Test\Modules\Backend\Module::class,
+                'className' => \Phalcon\Tests\Modules\Backend\Module::class,
                 'path'      => dataDir('fixtures/modules/backend/Module.php'),
             ],
         ];
diff --git a/tests/integration/Mvc/Application/GetSetDICest.php b/tests/integration/Mvc/Application/GetSetDICest.php
index fe2b0c6e2e0..80aa647246c 100644
--- a/tests/integration/Mvc/Application/GetSetDICest.php
+++ b/tests/integration/Mvc/Application/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/HandleCest.php b/tests/integration/Mvc/Application/HandleCest.php
index 9d0c9dae95d..3f7f3671c87 100644
--- a/tests/integration/Mvc/Application/HandleCest.php
+++ b/tests/integration/Mvc/Application/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
@@ -52,7 +52,7 @@ function () {
             function () {
                 $dispatcher = new Dispatcher();
                 $dispatcher->setDefaultNamespace(
-                    'Phalcon\Test\Controllers'
+                    'Phalcon\Tests\Controllers'
                 );
 
                 return $dispatcher;
@@ -104,7 +104,7 @@ function () {
             function () use ($eventsManager) {
                 $dispatcher = new Dispatcher();
                 $dispatcher->setDefaultNamespace(
-                    'Phalcon\Test\Controllers'
+                    'Phalcon\Tests\Controllers'
                 );
 
                 $eventsManager->attach(
@@ -173,7 +173,7 @@ function () {
             function () use ($eventsManager) {
                 $dispatcher = new Dispatcher();
                 $dispatcher->setDefaultNamespace(
-                    'Phalcon\Test\Controllers'
+                    'Phalcon\Tests\Controllers'
                 );
 
                 $eventsManager->attach(
diff --git a/tests/integration/Mvc/Application/SendCookiesOnHandleRequestCest.php b/tests/integration/Mvc/Application/SendCookiesOnHandleRequestCest.php
index 6cebc82da9f..91e9a39875c 100644
--- a/tests/integration/Mvc/Application/SendCookiesOnHandleRequestCest.php
+++ b/tests/integration/Mvc/Application/SendCookiesOnHandleRequestCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/SendHeadersOnHandleRequestCest.php b/tests/integration/Mvc/Application/SendHeadersOnHandleRequestCest.php
index 06984bbf144..b2175620f47 100644
--- a/tests/integration/Mvc/Application/SendHeadersOnHandleRequestCest.php
+++ b/tests/integration/Mvc/Application/SendHeadersOnHandleRequestCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/SetDefaultModuleCest.php b/tests/integration/Mvc/Application/SetDefaultModuleCest.php
index 647ee40fe4b..1c9bca23025 100644
--- a/tests/integration/Mvc/Application/SetDefaultModuleCest.php
+++ b/tests/integration/Mvc/Application/SetDefaultModuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/SetEventsManagerCest.php b/tests/integration/Mvc/Application/SetEventsManagerCest.php
index 72c7ee6a164..17b0d32828c 100644
--- a/tests/integration/Mvc/Application/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/Application/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/UnderscoreGetCest.php b/tests/integration/Mvc/Application/UnderscoreGetCest.php
index 910ec30930a..a8b75c34078 100644
--- a/tests/integration/Mvc/Application/UnderscoreGetCest.php
+++ b/tests/integration/Mvc/Application/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Application/UseImplicitViewCest.php b/tests/integration/Mvc/Application/UseImplicitViewCest.php
index 7f1679172ae..9e87a753c86 100644
--- a/tests/integration/Mvc/Application/UseImplicitViewCest.php
+++ b/tests/integration/Mvc/Application/UseImplicitViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Controller/ConstructCest.php b/tests/integration/Mvc/Controller/ConstructCest.php
index 1ddd5f86a37..2cbfdbae407 100644
--- a/tests/integration/Mvc/Controller/ConstructCest.php
+++ b/tests/integration/Mvc/Controller/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Controller;
+namespace Phalcon\Tests\Integration\Mvc\Controller;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Controller/GetDICest.php b/tests/integration/Mvc/Controller/GetDICest.php
index bca9d2959ca..2ebd03f8ec3 100644
--- a/tests/integration/Mvc/Controller/GetDICest.php
+++ b/tests/integration/Mvc/Controller/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Controller;
+namespace Phalcon\Tests\Integration\Mvc\Controller;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Controller/GetEventsManagerCest.php b/tests/integration/Mvc/Controller/GetEventsManagerCest.php
index 5be1b9c60a1..088784ecc0f 100644
--- a/tests/integration/Mvc/Controller/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/Controller/GetEventsManagerCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Controller;
+namespace Phalcon\Tests\Integration\Mvc\Controller;
 
 use IntegrationTester;
 use Phalcon\Events\Manager as EventsManager;
-use Phalcon\Test\Controllers\ViewRequestController;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Controllers\ViewRequestController;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GetEventsManagerCest
diff --git a/tests/integration/Mvc/Controller/SetDICest.php b/tests/integration/Mvc/Controller/SetDICest.php
index cc0c504e219..1483cdff653 100644
--- a/tests/integration/Mvc/Controller/SetDICest.php
+++ b/tests/integration/Mvc/Controller/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Controller;
+namespace Phalcon\Tests\Integration\Mvc\Controller;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Controller/SetEventsManagerCest.php b/tests/integration/Mvc/Controller/SetEventsManagerCest.php
index cc8414b9a9d..702de62fd1b 100644
--- a/tests/integration/Mvc/Controller/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/Controller/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Controller;
+namespace Phalcon\Tests\Integration\Mvc\Controller;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Controller/UnderscoreGetCest.php b/tests/integration/Mvc/Controller/UnderscoreGetCest.php
index 799b9983a54..52ff77a5ad4 100644
--- a/tests/integration/Mvc/Controller/UnderscoreGetCest.php
+++ b/tests/integration/Mvc/Controller/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Controller;
+namespace Phalcon\Tests\Integration\Mvc\Controller;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/CallActionMethodCest.php b/tests/integration/Mvc/Dispatcher/CallActionMethodCest.php
index f94b399520a..e2b1a019217 100644
--- a/tests/integration/Mvc/Dispatcher/CallActionMethodCest.php
+++ b/tests/integration/Mvc/Dispatcher/CallActionMethodCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
 
 class CallActionMethodCest extends BaseDispatcher
 {
diff --git a/tests/integration/Mvc/Dispatcher/DispatchCest.php b/tests/integration/Mvc/Dispatcher/DispatchCest.php
index 9ce6e2623b8..61e9db8ef46 100644
--- a/tests/integration/Mvc/Dispatcher/DispatchCest.php
+++ b/tests/integration/Mvc/Dispatcher/DispatchCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 use Phalcon\Dispatcher\Exception;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
 
 class DispatchCest extends BaseDispatcher
 {
@@ -36,7 +36,7 @@ public function testDefaultDispatchLoopEvents(IntegrationTester $I)
         $handler = $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -98,7 +98,7 @@ public function testHandlerNotFound(IntegrationTester $I)
 
         $I->expectThrowable(
             new Exception(
-                'Phalcon\Test\Integration\Mvc\Dispatcher\Helper\Non' .
+                'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\Non' .
                 'ExistentDispatcherHandlerController handler class cannot be loaded',
                 Exception::EXCEPTION_HANDLER_NOT_FOUND
             ),
diff --git a/tests/integration/Mvc/Dispatcher/ForwardCest.php b/tests/integration/Mvc/Dispatcher/ForwardCest.php
index 6b2edb12fd7..1fffa99613f 100644
--- a/tests/integration/Mvc/Dispatcher/ForwardCest.php
+++ b/tests/integration/Mvc/Dispatcher/ForwardCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetActionSuffixCest.php b/tests/integration/Mvc/Dispatcher/GetActionSuffixCest.php
index 74048155442..24d6afe78e4 100644
--- a/tests/integration/Mvc/Dispatcher/GetActionSuffixCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetActionSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetActiveControllerCest.php b/tests/integration/Mvc/Dispatcher/GetActiveControllerCest.php
index 9a7628d3df6..d497c3db0e0 100644
--- a/tests/integration/Mvc/Dispatcher/GetActiveControllerCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetActiveControllerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetActiveMethodCest.php b/tests/integration/Mvc/Dispatcher/GetActiveMethodCest.php
index 3e1ec358346..b97cacce3a4 100644
--- a/tests/integration/Mvc/Dispatcher/GetActiveMethodCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetActiveMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetBoundModelsCest.php b/tests/integration/Mvc/Dispatcher/GetBoundModelsCest.php
index 6380c92ef36..3d06b6c73c9 100644
--- a/tests/integration/Mvc/Dispatcher/GetBoundModelsCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetBoundModelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetControllerClassCest.php b/tests/integration/Mvc/Dispatcher/GetControllerClassCest.php
index 2f9ec5cd6f9..ca6c9ab0ed3 100644
--- a/tests/integration/Mvc/Dispatcher/GetControllerClassCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetControllerClassCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use Foo\IndexController;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 class GetControllerClassCest extends BaseDispatcher
 {
diff --git a/tests/integration/Mvc/Dispatcher/GetControllerNameCest.php b/tests/integration/Mvc/Dispatcher/GetControllerNameCest.php
index 752ddea7ee7..68793c7815c 100644
--- a/tests/integration/Mvc/Dispatcher/GetControllerNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetDefaultNamespaceCest.php b/tests/integration/Mvc/Dispatcher/GetDefaultNamespaceCest.php
index 22e48d0453b..695f98935b6 100644
--- a/tests/integration/Mvc/Dispatcher/GetDefaultNamespaceCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetEventsManagerCest.php b/tests/integration/Mvc/Dispatcher/GetEventsManagerCest.php
index 36f3e64d84f..751551e9ce5 100644
--- a/tests/integration/Mvc/Dispatcher/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetHandlerClassCest.php b/tests/integration/Mvc/Dispatcher/GetHandlerClassCest.php
index eeebdb11246..38a62f179c5 100644
--- a/tests/integration/Mvc/Dispatcher/GetHandlerClassCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetHandlerClassCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php b/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php
index e7174b3075d..7c4d76e40e3 100644
--- a/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 use Phalcon\Mvc\Dispatcher\Exception;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 class GetHandlerSuffixCest extends BaseDispatcher
 {
@@ -37,7 +37,7 @@ public function mvcDispatcherGetHandlerSuffix(IntegrationTester $I)
 
         $I->expectThrowable(
             new Exception(
-                'Phalcon\Test\Integration\Mvc\Dispatcher\Helper\IndexBleh handler class cannot be loaded',
+                'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\IndexBleh handler class cannot be loaded',
                 Exception::EXCEPTION_HANDLER_NOT_FOUND
             ),
             function () use ($dispatcher) {
diff --git a/tests/integration/Mvc/Dispatcher/GetLastControllerCest.php b/tests/integration/Mvc/Dispatcher/GetLastControllerCest.php
index b01af449c5a..4a2e9827cfe 100644
--- a/tests/integration/Mvc/Dispatcher/GetLastControllerCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetLastControllerCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController;
 
 class GetLastControllerCest extends BaseDispatcher
 {
diff --git a/tests/integration/Mvc/Dispatcher/GetModelBinderCest.php b/tests/integration/Mvc/Dispatcher/GetModelBinderCest.php
index 69054b3e3c9..c3663b2ebda 100644
--- a/tests/integration/Mvc/Dispatcher/GetModelBinderCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetModuleNameCest.php b/tests/integration/Mvc/Dispatcher/GetModuleNameCest.php
index 490501816e6..d536e63617f 100644
--- a/tests/integration/Mvc/Dispatcher/GetModuleNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetNamespaceNameCest.php b/tests/integration/Mvc/Dispatcher/GetNamespaceNameCest.php
index 76e3933748e..f63f24c5652 100644
--- a/tests/integration/Mvc/Dispatcher/GetNamespaceNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetParamCest.php b/tests/integration/Mvc/Dispatcher/GetParamCest.php
index c5d59765768..e3939a3a3e8 100644
--- a/tests/integration/Mvc/Dispatcher/GetParamCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetParamsCest.php b/tests/integration/Mvc/Dispatcher/GetParamsCest.php
index 0684309eab0..7942a9a3e97 100644
--- a/tests/integration/Mvc/Dispatcher/GetParamsCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetPreviousActionNameCest.php b/tests/integration/Mvc/Dispatcher/GetPreviousActionNameCest.php
index 5aea77ebad0..bc412e5e407 100644
--- a/tests/integration/Mvc/Dispatcher/GetPreviousActionNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetPreviousActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetPreviousControllerNameCest.php b/tests/integration/Mvc/Dispatcher/GetPreviousControllerNameCest.php
index 9b75cecc0e2..49cd9e15dee 100644
--- a/tests/integration/Mvc/Dispatcher/GetPreviousControllerNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetPreviousControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetPreviousNamespaceNameCest.php b/tests/integration/Mvc/Dispatcher/GetPreviousNamespaceNameCest.php
index 417c6aa9f62..0ca71ec99d2 100644
--- a/tests/integration/Mvc/Dispatcher/GetPreviousNamespaceNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetPreviousNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetReturnedValueCest.php b/tests/integration/Mvc/Dispatcher/GetReturnedValueCest.php
index ea9e96fb461..75b5f64104a 100644
--- a/tests/integration/Mvc/Dispatcher/GetReturnedValueCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetReturnedValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/GetSetActionNameCest.php b/tests/integration/Mvc/Dispatcher/GetSetActionNameCest.php
index 1f2e4c052ee..4d56295c668 100644
--- a/tests/integration/Mvc/Dispatcher/GetSetActionNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetSetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 use Phalcon\Mvc\Dispatcher;
diff --git a/tests/integration/Mvc/Dispatcher/GetSetDICest.php b/tests/integration/Mvc/Dispatcher/GetSetDICest.php
index e3d81bb7887..0b9d3619e03 100644
--- a/tests/integration/Mvc/Dispatcher/GetSetDICest.php
+++ b/tests/integration/Mvc/Dispatcher/GetSetDICest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Mvc\Dispatcher;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetDICest
 {
diff --git a/tests/integration/Mvc/Dispatcher/HasParamCest.php b/tests/integration/Mvc/Dispatcher/HasParamCest.php
index f884bcf5881..4961c92242c 100644
--- a/tests/integration/Mvc/Dispatcher/HasParamCest.php
+++ b/tests/integration/Mvc/Dispatcher/HasParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/Helper/BaseDispatcher.php b/tests/integration/Mvc/Dispatcher/Helper/BaseDispatcher.php
index 64d1b876c3e..9ff56e545d1 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/BaseDispatcher.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/BaseDispatcher.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use IntegrationTester;
 use Phalcon\Di;
@@ -10,7 +10,7 @@
 use Phalcon\Mvc\Dispatcher;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher
  * Base IntegrationTest to assist with testing various \Phalcon\Dispatcher,
  * Phalcon\Mvc\Dispatcher, and other related components.
  *
@@ -66,7 +66,7 @@ function () use ($dispatcherListener) {
                 $dispatcher = new Dispatcher();
 
                 // Initialize defaults such that these don't need to be specified everywhere
-                $dispatcher->setNamespaceName('Phalcon\Test\Integration\Mvc\Dispatcher\Helper');
+                $dispatcher->setNamespaceName('Phalcon\Tests\Integration\Mvc\Dispatcher\Helper');
                 $dispatcher->setControllerName('dispatcher-test-default');
                 $dispatcher->setActionName('index');
 
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherListener.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherListener.php
index 6fe06bf30fe..ac5f1cc04b9 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherListener.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherListener.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
 use Phalcon\Dispatcher\DispatcherInterface;
 use Phalcon\Events\Event;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherListener
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherListener
  * Early listener for all dispatch events.
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php
index 581c75d9784..0845ca4a76e 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteExceptionController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteExceptionController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php
index 7e187b03578..e70a7b20df8 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteForwardController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteForwardController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php
index 8ff51057ea1..3342a5705ee 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php
index 4a369737493..62c6607cd38 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteExceptionController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteExceptionController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php
index b0116240104..10941a1318e 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteForwardController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteForwardController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php
index a2c0923a364..2cab74a8183 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php
index bc8091f55a6..4e15e8af0b7 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php
index 5d5ec08441c..fe883be7732 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php
@@ -79,7 +79,7 @@ public function forwardExternalAction()
 
         $dispatcher->forward(
             [
-                'namespace'  => 'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+                'namespace'  => 'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
                 'controller' => 'dispatcher-test-default',
                 'action'     => 'index',
             ]
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.php
index c9ab91e5fec..77ceee31a02 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultSimpleController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultSimpleController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.php
index ee0572aee54..2d985b586d4 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.php
index c8352f0eb29..979d9a0f573 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeExceptionController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeExceptionController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.php
index b77d2f12b6d..b4cef9810bf 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeForwardController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeForwardController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.php
index 6872b14df45..5370eec2fbe 100644
--- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.php
+++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Helper;
 
 use Phalcon\Mvc\Controller;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeReturnFalseController
+ * \Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeReturnFalseController
  * Dispatcher Controller for testing different dispatch scenarios
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/integration/Mvc/Dispatcher/IsFinishedCest.php b/tests/integration/Mvc/Dispatcher/IsFinishedCest.php
index 5f81d0332b5..dcdb0e40fb8 100644
--- a/tests/integration/Mvc/Dispatcher/IsFinishedCest.php
+++ b/tests/integration/Mvc/Dispatcher/IsFinishedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchCest.php
index e0406254de3..1f7b5a04e0f 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherAfterDispatchCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherAfterDispatchCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchLoopCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchLoopCest.php
index 76a1289daa9..76946758c71 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchLoopCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterDispatchLoopCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherAfterDispatchLoopCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherAfterDispatchLoopCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteCest.php
index bd826bd51cd..d7b00a14cd8 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherAfterExecuteRouteCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherAfterExecuteRouteCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteMethodCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteMethodCest.php
index f9ecbb70119..8e4fb1f1866 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteMethodCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterExecuteRouteMethodCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherAfterExecuteRouteMethodCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherAfterExecuteRouteMethodCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterInitializeCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterInitializeCest.php
index 7254cccad0d..9f5aced3d9d 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterInitializeCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherAfterInitializeCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherAfterInitializeCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherAfterInitializeCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchCest.php
index 3358c038c10..ccc264a7bcd 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherBeforeDispatchCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherBeforeDispatchCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchLoopCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchLoopCest.php
index 465d3a9585b..f2ae6bbcb15 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchLoopCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeDispatchLoopCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherBeforeDispatchLoopCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherBeforeDispatchLoopCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteCest.php
index d81399e34c6..e36cf8a6e39 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherBeforeExecuteRouteCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherBeforeExecuteRouteCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteMethodCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteMethodCest.php
index 238971946ec..6d6758af73a 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteMethodCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherBeforeExecuteRouteMethodCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherBeforeExecuteRouteMethodCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherBeforeExecuteRouteMethodCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherCest.php
index ac2ff78a882..e2b2611a2b5 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherCest.php
@@ -11,20 +11,20 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Phalcon\Mvc\Dispatcher\Exception;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultSimpleController;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultSimpleController;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController;
 use DispatcherTestDefaultNoNamespaceController;
 use IntegrationTester;
 
 /**
  * Class DispatcherCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherCest extends BaseDispatcher
@@ -45,7 +45,7 @@ public function testDefaultDispatchLoopEventsWithNoHandlers(IntegrationTester $I
         $handler = $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -115,7 +115,7 @@ public function testControllerActionLocalForward(IntegrationTester $I)
         $handler = $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -163,7 +163,7 @@ public function testControllerActionLocalForward(IntegrationTester $I)
         );
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getPreviousNamespaceName()
         );
 
@@ -223,7 +223,7 @@ public function testControllerActionExternalForward(IntegrationTester $I)
         $handler = $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -271,7 +271,7 @@ public function testControllerActionExternalForward(IntegrationTester $I)
         );
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getPreviousNamespaceName()
         );
 
@@ -326,7 +326,7 @@ public function testControllerActionReturnValueString(IntegrationTester $I)
         $handler = $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -380,7 +380,7 @@ public function testControllerActionReturnValueInt(IntegrationTester $I)
         $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -437,7 +437,7 @@ public function testParamsAndReturnValue(IntegrationTester $I)
         $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -635,7 +635,7 @@ public function testMixingNamespaceForward(IntegrationTester $I)
         $handler = $dispatcher->dispatch();
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -734,7 +734,7 @@ function ($event, $dispatcher) use (&$beforeExceptionHandled, $I) {
                 $beforeExceptionHandled = true;
 
                 $I->assertEquals(
-                    'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+                    'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
                     $dispatcher->getNamespaceName()
                 );
 
@@ -774,7 +774,7 @@ function ($event, $dispatcher) use (&$beforeExceptionHandled, $I) {
         $I->assertTrue($beforeExceptionHandled);
 
         $I->assertEquals(
-            'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+            'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
             $dispatcher->getNamespaceName()
         );
 
@@ -822,7 +822,7 @@ function ($event, $dispatcher) use (&$beforeExceptionHandled, $I) {
                 $beforeExceptionHandled = true;
 
                 $I->assertEquals(
-                    'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+                    'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
                     $dispatcher->getNamespaceName()
                 );
 
@@ -875,7 +875,7 @@ function ($event, $dispatcher) use (&$beforeExceptionHandled, $I) {
             // The string properties get updated
 
             $I->assertEquals(
-                'Phalcon\Test\Integration\Mvc\Dispatcher\Helper',
+                'Phalcon\Tests\Integration\Mvc\Dispatcher\Helper',
                 $dispatcher->getNamespaceName()
             );
 
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherInitializeMethodCest.php b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherInitializeMethodCest.php
index 17a7ca0f87d..2037c212551 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/DispatcherInitializeMethodCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/DispatcherInitializeMethodCest.php
@@ -11,16 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 /**
  * Class DispatcherInitializeMethodCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class DispatcherInitializeMethodCest extends BaseDispatcher
diff --git a/tests/integration/Mvc/Dispatcher/Refactor/ForwardCest.php b/tests/integration/Mvc/Dispatcher/Refactor/ForwardCest.php
index 5a103650664..5b79f0140bb 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor/ForwardCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor/ForwardCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher\Refactor;
 
 use Exception;
 use IntegrationTester;
@@ -24,7 +24,7 @@
 /**
  * Class RefactorForwardCest
  *
- * @package Phalcon\Test\Integration\Mvc\Dispatcher
+ * @package Phalcon\Tests\Integration\Mvc\Dispatcher
  * @todo: refactor
  */
 class ForwardCest
@@ -57,7 +57,7 @@ function () {
             function ($event, $dispatcher, $exception) {
                 $dispatcher->forward(
                     [
-                        'namespace'  => 'Phalcon\Test\Controllers',
+                        'namespace'  => 'Phalcon\Tests\Controllers',
                         'controller' => 'exception',
                         'action'     => 'second',
                     ]
diff --git a/tests/integration/Mvc/Dispatcher/SetActionSuffixCest.php b/tests/integration/Mvc/Dispatcher/SetActionSuffixCest.php
index b0756aaf9d3..bfaace8fecb 100644
--- a/tests/integration/Mvc/Dispatcher/SetActionSuffixCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetActionSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetControllerNameCest.php b/tests/integration/Mvc/Dispatcher/SetControllerNameCest.php
index 17eff998fcf..47ac4a7c81c 100644
--- a/tests/integration/Mvc/Dispatcher/SetControllerNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetControllerSuffixCest.php b/tests/integration/Mvc/Dispatcher/SetControllerSuffixCest.php
index 112dc88e9ba..835ab130de7 100644
--- a/tests/integration/Mvc/Dispatcher/SetControllerSuffixCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetControllerSuffixCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 class SetControllerSuffixCest extends BaseDispatcher
 {
diff --git a/tests/integration/Mvc/Dispatcher/SetDefaultActionCest.php b/tests/integration/Mvc/Dispatcher/SetDefaultActionCest.php
index c56064401df..a524c35c623 100644
--- a/tests/integration/Mvc/Dispatcher/SetDefaultActionCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetDefaultControllerCest.php b/tests/integration/Mvc/Dispatcher/SetDefaultControllerCest.php
index d457c94da26..94751e3b001 100644
--- a/tests/integration/Mvc/Dispatcher/SetDefaultControllerCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetDefaultControllerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetDefaultNamespaceCest.php b/tests/integration/Mvc/Dispatcher/SetDefaultNamespaceCest.php
index e7839050a0e..7cc7f10ea57 100644
--- a/tests/integration/Mvc/Dispatcher/SetDefaultNamespaceCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetEventsManagerCest.php b/tests/integration/Mvc/Dispatcher/SetEventsManagerCest.php
index 0faebbde46b..37a970edebb 100644
--- a/tests/integration/Mvc/Dispatcher/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetHandlerSuffixCest.php b/tests/integration/Mvc/Dispatcher/SetHandlerSuffixCest.php
index fc375a4798d..54e34d420fa 100644
--- a/tests/integration/Mvc/Dispatcher/SetHandlerSuffixCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetHandlerSuffixCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
-use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
+use Phalcon\Tests\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
 class SetHandlerSuffixCest extends BaseDispatcher
 {
diff --git a/tests/integration/Mvc/Dispatcher/SetModelBinderCest.php b/tests/integration/Mvc/Dispatcher/SetModelBinderCest.php
index c0aab33e096..8bfdd7b0f93 100644
--- a/tests/integration/Mvc/Dispatcher/SetModelBinderCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetModuleNameCest.php b/tests/integration/Mvc/Dispatcher/SetModuleNameCest.php
index 62eb7057bef..38f28c0071d 100644
--- a/tests/integration/Mvc/Dispatcher/SetModuleNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetNamespaceNameCest.php b/tests/integration/Mvc/Dispatcher/SetNamespaceNameCest.php
index beaaee9ad20..52ed488e9c9 100644
--- a/tests/integration/Mvc/Dispatcher/SetNamespaceNameCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetParamCest.php b/tests/integration/Mvc/Dispatcher/SetParamCest.php
index f13e525bad5..ff42e1043ba 100644
--- a/tests/integration/Mvc/Dispatcher/SetParamCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetParamsCest.php b/tests/integration/Mvc/Dispatcher/SetParamsCest.php
index c79824a380a..f808cb97402 100644
--- a/tests/integration/Mvc/Dispatcher/SetParamsCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/SetReturnedValueCest.php b/tests/integration/Mvc/Dispatcher/SetReturnedValueCest.php
index 8c43c4f6387..959e4b0ad2a 100644
--- a/tests/integration/Mvc/Dispatcher/SetReturnedValueCest.php
+++ b/tests/integration/Mvc/Dispatcher/SetReturnedValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Dispatcher/WasForwardedCest.php b/tests/integration/Mvc/Dispatcher/WasForwardedCest.php
index c255341430e..dfc4868e41a 100644
--- a/tests/integration/Mvc/Dispatcher/WasForwardedCest.php
+++ b/tests/integration/Mvc/Dispatcher/WasForwardedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Dispatcher;
+namespace Phalcon\Tests\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/AfterBindingCest.php b/tests/integration/Mvc/Micro/AfterBindingCest.php
index 9c6343d31a4..6aa556a5053 100644
--- a/tests/integration/Mvc/Micro/AfterBindingCest.php
+++ b/tests/integration/Mvc/Micro/AfterBindingCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Events\Event;
 use Phalcon\Events\Manager;
 use Phalcon\Mvc\Micro;
-use Phalcon\Test\Fixtures\Micro\MyMiddleware;
-use Phalcon\Test\Fixtures\Micro\MyMiddlewareStop;
+use Phalcon\Tests\Fixtures\Micro\MyMiddleware;
+use Phalcon\Tests\Fixtures\Micro\MyMiddlewareStop;
 
 class AfterBindingCest
 {
diff --git a/tests/integration/Mvc/Micro/AfterCest.php b/tests/integration/Mvc/Micro/AfterCest.php
index ff623d58139..d2b6825338a 100644
--- a/tests/integration/Mvc/Micro/AfterCest.php
+++ b/tests/integration/Mvc/Micro/AfterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/BeforeCest.php b/tests/integration/Mvc/Micro/BeforeCest.php
index e5050d6b54c..6506da86430 100644
--- a/tests/integration/Mvc/Micro/BeforeCest.php
+++ b/tests/integration/Mvc/Micro/BeforeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/Collection/DeleteCest.php b/tests/integration/Mvc/Micro/Collection/DeleteCest.php
index 4176df691f5..fd724d4f751 100644
--- a/tests/integration/Mvc/Micro/Collection/DeleteCest.php
+++ b/tests/integration/Mvc/Micro/Collection/DeleteCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class DeleteCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/GetCest.php b/tests/integration/Mvc/Micro/Collection/GetCest.php
index 9bcc418e722..e0af912f38c 100644
--- a/tests/integration/Mvc/Micro/Collection/GetCest.php
+++ b/tests/integration/Mvc/Micro/Collection/GetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class GetCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/GetHandlerCest.php b/tests/integration/Mvc/Micro/Collection/GetHandlerCest.php
index 96ba7560273..daf1e06487e 100644
--- a/tests/integration/Mvc/Micro/Collection/GetHandlerCest.php
+++ b/tests/integration/Mvc/Micro/Collection/GetHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/Collection/GetHandlersCest.php b/tests/integration/Mvc/Micro/Collection/GetHandlersCest.php
index fc66a1eae76..ac364645343 100644
--- a/tests/integration/Mvc/Micro/Collection/GetHandlersCest.php
+++ b/tests/integration/Mvc/Micro/Collection/GetHandlersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/Collection/GetPrefixCest.php b/tests/integration/Mvc/Micro/Collection/GetPrefixCest.php
index 76d1cc37afe..ceb4513695b 100644
--- a/tests/integration/Mvc/Micro/Collection/GetPrefixCest.php
+++ b/tests/integration/Mvc/Micro/Collection/GetPrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/Collection/HeadCest.php b/tests/integration/Mvc/Micro/Collection/HeadCest.php
index edb40c35654..860530b6a14 100644
--- a/tests/integration/Mvc/Micro/Collection/HeadCest.php
+++ b/tests/integration/Mvc/Micro/Collection/HeadCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class HeadCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/IsLazyCest.php b/tests/integration/Mvc/Micro/Collection/IsLazyCest.php
index 8eadb62c26b..3c8f8c50c54 100644
--- a/tests/integration/Mvc/Micro/Collection/IsLazyCest.php
+++ b/tests/integration/Mvc/Micro/Collection/IsLazyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class IsLazyCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/MapCest.php b/tests/integration/Mvc/Micro/Collection/MapCest.php
index ce215258d2b..623de2a4914 100644
--- a/tests/integration/Mvc/Micro/Collection/MapCest.php
+++ b/tests/integration/Mvc/Micro/Collection/MapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/Collection/MapViaCest.php b/tests/integration/Mvc/Micro/Collection/MapViaCest.php
index 905839917b9..78b5d17d14d 100644
--- a/tests/integration/Mvc/Micro/Collection/MapViaCest.php
+++ b/tests/integration/Mvc/Micro/Collection/MapViaCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Controllers\MicroController;
+use Phalcon\Tests\Controllers\MicroController;
 
 /**
  * Class MapViaCest
diff --git a/tests/integration/Mvc/Micro/Collection/OptionsCest.php b/tests/integration/Mvc/Micro/Collection/OptionsCest.php
index fd4a74f1967..c3bbe99ade4 100644
--- a/tests/integration/Mvc/Micro/Collection/OptionsCest.php
+++ b/tests/integration/Mvc/Micro/Collection/OptionsCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class OptionsCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/PatchCest.php b/tests/integration/Mvc/Micro/Collection/PatchCest.php
index 64c8b838c2c..026744b0540 100644
--- a/tests/integration/Mvc/Micro/Collection/PatchCest.php
+++ b/tests/integration/Mvc/Micro/Collection/PatchCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class PatchCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/PostCest.php b/tests/integration/Mvc/Micro/Collection/PostCest.php
index 18cd76bd459..61ed1e6a4c7 100644
--- a/tests/integration/Mvc/Micro/Collection/PostCest.php
+++ b/tests/integration/Mvc/Micro/Collection/PostCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class PostCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/PutCest.php b/tests/integration/Mvc/Micro/Collection/PutCest.php
index 412be8cf294..de94bd57841 100644
--- a/tests/integration/Mvc/Micro/Collection/PutCest.php
+++ b/tests/integration/Mvc/Micro/Collection/PutCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Fixtures\Micro\HttpMethodHandler;
+use Phalcon\Tests\Fixtures\Micro\HttpMethodHandler;
 
 class PutCest
 {
diff --git a/tests/integration/Mvc/Micro/Collection/SetHandlerCest.php b/tests/integration/Mvc/Micro/Collection/SetHandlerCest.php
index e71730aed81..2e8f429cec1 100644
--- a/tests/integration/Mvc/Micro/Collection/SetHandlerCest.php
+++ b/tests/integration/Mvc/Micro/Collection/SetHandlerCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Controllers\Micro\Collections\PersonasLazyController;
+use Phalcon\Tests\Controllers\Micro\Collections\PersonasLazyController;
 
 /**
  * Class SetHandlerCest
diff --git a/tests/integration/Mvc/Micro/Collection/SetLazyCest.php b/tests/integration/Mvc/Micro/Collection/SetLazyCest.php
index baca4192ef7..def4c789f4c 100644
--- a/tests/integration/Mvc/Micro/Collection/SetLazyCest.php
+++ b/tests/integration/Mvc/Micro/Collection/SetLazyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/Micro/Collection/SetPrefixCest.php b/tests/integration/Mvc/Micro/Collection/SetPrefixCest.php
index f327fb2b7ca..990f9a6a785 100644
--- a/tests/integration/Mvc/Micro/Collection/SetPrefixCest.php
+++ b/tests/integration/Mvc/Micro/Collection/SetPrefixCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Collection;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Collection;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Controllers\Micro\Collections\PersonasController;
+use Phalcon\Tests\Controllers\Micro\Collections\PersonasController;
 
 /**
  * Class SetPrefixCest
diff --git a/tests/integration/Mvc/Micro/ConstructCest.php b/tests/integration/Mvc/Micro/ConstructCest.php
index dd4c5aa3813..aa467147e68 100644
--- a/tests/integration/Mvc/Micro/ConstructCest.php
+++ b/tests/integration/Mvc/Micro/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/DeleteCest.php b/tests/integration/Mvc/Micro/DeleteCest.php
index 13b8fbef199..f404a372e3a 100644
--- a/tests/integration/Mvc/Micro/DeleteCest.php
+++ b/tests/integration/Mvc/Micro/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/ErrorCest.php b/tests/integration/Mvc/Micro/ErrorCest.php
index ff79a0bed80..467e1a962cb 100644
--- a/tests/integration/Mvc/Micro/ErrorCest.php
+++ b/tests/integration/Mvc/Micro/ErrorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use Exception;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/Micro/FinishCest.php b/tests/integration/Mvc/Micro/FinishCest.php
index d0ae44fdecf..8805bbe00ff 100644
--- a/tests/integration/Mvc/Micro/FinishCest.php
+++ b/tests/integration/Mvc/Micro/FinishCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/GetActiveHandlerCest.php b/tests/integration/Mvc/Micro/GetActiveHandlerCest.php
index 34baa1ce715..97667e61274 100644
--- a/tests/integration/Mvc/Micro/GetActiveHandlerCest.php
+++ b/tests/integration/Mvc/Micro/GetActiveHandlerCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
 use Phalcon\Mvc\Micro\LazyLoader;
-use Phalcon\Test\Fixtures\Micro\RestHandler;
+use Phalcon\Tests\Fixtures\Micro\RestHandler;
 
 use function is_array;
 
diff --git a/tests/integration/Mvc/Micro/GetBoundModelsCest.php b/tests/integration/Mvc/Micro/GetBoundModelsCest.php
index b7f88638af5..869fc3994cb 100644
--- a/tests/integration/Mvc/Micro/GetBoundModelsCest.php
+++ b/tests/integration/Mvc/Micro/GetBoundModelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/GetCest.php b/tests/integration/Mvc/Micro/GetCest.php
index 9b7e169409e..a344b3a6dd5 100644
--- a/tests/integration/Mvc/Micro/GetCest.php
+++ b/tests/integration/Mvc/Micro/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/GetEventsManagerCest.php b/tests/integration/Mvc/Micro/GetEventsManagerCest.php
index 199196358c2..9d0cf3eb5cf 100644
--- a/tests/integration/Mvc/Micro/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/Micro/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/GetHandlersCest.php b/tests/integration/Mvc/Micro/GetHandlersCest.php
index f0c2c2539c6..1fed7ab3329 100644
--- a/tests/integration/Mvc/Micro/GetHandlersCest.php
+++ b/tests/integration/Mvc/Micro/GetHandlersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/GetModelBinderCest.php b/tests/integration/Mvc/Micro/GetModelBinderCest.php
index bf5b61b4937..7822d7bff2e 100644
--- a/tests/integration/Mvc/Micro/GetModelBinderCest.php
+++ b/tests/integration/Mvc/Micro/GetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/GetReturnedValueCest.php b/tests/integration/Mvc/Micro/GetReturnedValueCest.php
index 38ed0389f7b..0815fbbcebd 100644
--- a/tests/integration/Mvc/Micro/GetReturnedValueCest.php
+++ b/tests/integration/Mvc/Micro/GetReturnedValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/GetRouterCest.php b/tests/integration/Mvc/Micro/GetRouterCest.php
index a282da3fd8c..60a2e9903e1 100644
--- a/tests/integration/Mvc/Micro/GetRouterCest.php
+++ b/tests/integration/Mvc/Micro/GetRouterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/GetServiceCest.php b/tests/integration/Mvc/Micro/GetServiceCest.php
index e8551755129..e155e50d99c 100644
--- a/tests/integration/Mvc/Micro/GetServiceCest.php
+++ b/tests/integration/Mvc/Micro/GetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/Micro/GetSetDICest.php b/tests/integration/Mvc/Micro/GetSetDICest.php
index 3385b9e07c5..21560c08955 100644
--- a/tests/integration/Mvc/Micro/GetSetDICest.php
+++ b/tests/integration/Mvc/Micro/GetSetDICest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
 use Phalcon\Mvc\Micro;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetDICest
 {
diff --git a/tests/integration/Mvc/Micro/GetSharedServiceCest.php b/tests/integration/Mvc/Micro/GetSharedServiceCest.php
index b06501770c1..1db59dd30c7 100644
--- a/tests/integration/Mvc/Micro/GetSharedServiceCest.php
+++ b/tests/integration/Mvc/Micro/GetSharedServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/HandleCest.php b/tests/integration/Mvc/Micro/HandleCest.php
index 63a48d3d8fe..c2702ff7363 100644
--- a/tests/integration/Mvc/Micro/HandleCest.php
+++ b/tests/integration/Mvc/Micro/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/HasServiceCest.php b/tests/integration/Mvc/Micro/HasServiceCest.php
index d21bda2d440..fe47b067dea 100644
--- a/tests/integration/Mvc/Micro/HasServiceCest.php
+++ b/tests/integration/Mvc/Micro/HasServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/Micro/HeadCest.php b/tests/integration/Mvc/Micro/HeadCest.php
index 181967d4dcc..a3a0a1a03ee 100644
--- a/tests/integration/Mvc/Micro/HeadCest.php
+++ b/tests/integration/Mvc/Micro/HeadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/LazyLoader/CallMethodCest.php b/tests/integration/Mvc/Micro/LazyLoader/CallMethodCest.php
index 0fedb07190e..c25bc9285bb 100644
--- a/tests/integration/Mvc/Micro/LazyLoader/CallMethodCest.php
+++ b/tests/integration/Mvc/Micro/LazyLoader/CallMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\LazyLoader;
+namespace Phalcon\Tests\Integration\Mvc\Micro\LazyLoader;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/LazyLoader/ConstructCest.php b/tests/integration/Mvc/Micro/LazyLoader/ConstructCest.php
index de3edca9a94..9a9d6feffc1 100644
--- a/tests/integration/Mvc/Micro/LazyLoader/ConstructCest.php
+++ b/tests/integration/Mvc/Micro/LazyLoader/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\LazyLoader;
+namespace Phalcon\Tests\Integration\Mvc\Micro\LazyLoader;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/LazyLoader/GetDefinitionCest.php b/tests/integration/Mvc/Micro/LazyLoader/GetDefinitionCest.php
index 5cd7c7c0c04..45ac0536272 100644
--- a/tests/integration/Mvc/Micro/LazyLoader/GetDefinitionCest.php
+++ b/tests/integration/Mvc/Micro/LazyLoader/GetDefinitionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\LazyLoader;
+namespace Phalcon\Tests\Integration\Mvc\Micro\LazyLoader;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/LazyLoader/GetHandlerCest.php b/tests/integration/Mvc/Micro/LazyLoader/GetHandlerCest.php
index bbd08cc4ada..301209fa7f2 100644
--- a/tests/integration/Mvc/Micro/LazyLoader/GetHandlerCest.php
+++ b/tests/integration/Mvc/Micro/LazyLoader/GetHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro\LazyLoader;
+namespace Phalcon\Tests\Integration\Mvc\Micro\LazyLoader;
 
 use IntegrationTester;
 use Phalcon\Assets\Manager;
diff --git a/tests/integration/Mvc/Micro/MapCest.php b/tests/integration/Mvc/Micro/MapCest.php
index 800a9a7cd43..a2fbcfe6d6a 100644
--- a/tests/integration/Mvc/Micro/MapCest.php
+++ b/tests/integration/Mvc/Micro/MapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/MountCest.php b/tests/integration/Mvc/Micro/MountCest.php
index cc5308659fc..9080367903c 100644
--- a/tests/integration/Mvc/Micro/MountCest.php
+++ b/tests/integration/Mvc/Micro/MountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/NotFoundCest.php b/tests/integration/Mvc/Micro/NotFoundCest.php
index ac5fd981cf7..d4d5d43fae9 100644
--- a/tests/integration/Mvc/Micro/NotFoundCest.php
+++ b/tests/integration/Mvc/Micro/NotFoundCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
-use Phalcon\Test\Fixtures\Micro\RestHandler;
+use Phalcon\Tests\Fixtures\Micro\RestHandler;
 
 /**
  * Class NotFoundCest
diff --git a/tests/integration/Mvc/Micro/OffsetExistsCest.php b/tests/integration/Mvc/Micro/OffsetExistsCest.php
index c2be895f718..da514529d1f 100644
--- a/tests/integration/Mvc/Micro/OffsetExistsCest.php
+++ b/tests/integration/Mvc/Micro/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/Micro/OffsetGetCest.php b/tests/integration/Mvc/Micro/OffsetGetCest.php
index 35c562cabb8..a5e01384490 100644
--- a/tests/integration/Mvc/Micro/OffsetGetCest.php
+++ b/tests/integration/Mvc/Micro/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/Micro/OffsetSetCest.php b/tests/integration/Mvc/Micro/OffsetSetCest.php
index b90d676a2fb..3fb2eafa49f 100644
--- a/tests/integration/Mvc/Micro/OffsetSetCest.php
+++ b/tests/integration/Mvc/Micro/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/Micro/OffsetUnsetCest.php b/tests/integration/Mvc/Micro/OffsetUnsetCest.php
index 54df3c807b2..3deb7a93f38 100644
--- a/tests/integration/Mvc/Micro/OffsetUnsetCest.php
+++ b/tests/integration/Mvc/Micro/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/Micro/OptionsCest.php b/tests/integration/Mvc/Micro/OptionsCest.php
index 2ccfc9aa39d..2fabd50b7e0 100644
--- a/tests/integration/Mvc/Micro/OptionsCest.php
+++ b/tests/integration/Mvc/Micro/OptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/PatchCest.php b/tests/integration/Mvc/Micro/PatchCest.php
index 68ce19d6f16..c629a300142 100644
--- a/tests/integration/Mvc/Micro/PatchCest.php
+++ b/tests/integration/Mvc/Micro/PatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/PostCest.php b/tests/integration/Mvc/Micro/PostCest.php
index 82eb0841818..f2d72a9a10b 100644
--- a/tests/integration/Mvc/Micro/PostCest.php
+++ b/tests/integration/Mvc/Micro/PostCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/PutCest.php b/tests/integration/Mvc/Micro/PutCest.php
index dd79ea3a7af..47399e9f501 100644
--- a/tests/integration/Mvc/Micro/PutCest.php
+++ b/tests/integration/Mvc/Micro/PutCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/Refactor/MicroMvcCollectionsCest.php b/tests/integration/Mvc/Micro/Refactor/MicroMvcCollectionsCest.php
index f9bcaa2879c..55e9bb0f708 100644
--- a/tests/integration/Mvc/Micro/Refactor/MicroMvcCollectionsCest.php
+++ b/tests/integration/Mvc/Micro/Refactor/MicroMvcCollectionsCest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Micro\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Micro\Refactor;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Test\Controllers\Micro\Collections\PersonasController;
+use Phalcon\Tests\Controllers\Micro\Collections\PersonasController;
 
 class MicroMvcCollectionsCest
 {
diff --git a/tests/integration/Mvc/Micro/SetActiveHandlerCest.php b/tests/integration/Mvc/Micro/SetActiveHandlerCest.php
index 7290b85fa1f..785aee281f2 100644
--- a/tests/integration/Mvc/Micro/SetActiveHandlerCest.php
+++ b/tests/integration/Mvc/Micro/SetActiveHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/SetEventsManagerCest.php b/tests/integration/Mvc/Micro/SetEventsManagerCest.php
index 1f807a08cfe..0d5f0f8fb7d 100644
--- a/tests/integration/Mvc/Micro/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/Micro/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/SetModelBinderCest.php b/tests/integration/Mvc/Micro/SetModelBinderCest.php
index 796b345d979..9275b8b658c 100644
--- a/tests/integration/Mvc/Micro/SetModelBinderCest.php
+++ b/tests/integration/Mvc/Micro/SetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/SetResponseHandlerCest.php b/tests/integration/Mvc/Micro/SetResponseHandlerCest.php
index 4646264767c..7632aa0a325 100644
--- a/tests/integration/Mvc/Micro/SetResponseHandlerCest.php
+++ b/tests/integration/Mvc/Micro/SetResponseHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 use Phalcon\Mvc\Micro;
diff --git a/tests/integration/Mvc/Micro/SetServiceCest.php b/tests/integration/Mvc/Micro/SetServiceCest.php
index 013cdc6a9e0..a89a22e175c 100644
--- a/tests/integration/Mvc/Micro/SetServiceCest.php
+++ b/tests/integration/Mvc/Micro/SetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/StopCest.php b/tests/integration/Mvc/Micro/StopCest.php
index c186b21ba75..1052e87525c 100644
--- a/tests/integration/Mvc/Micro/StopCest.php
+++ b/tests/integration/Mvc/Micro/StopCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Micro/UnderscoreGetCest.php b/tests/integration/Mvc/Micro/UnderscoreGetCest.php
index 04ca0733884..e75480d1bc8 100644
--- a/tests/integration/Mvc/Micro/UnderscoreGetCest.php
+++ b/tests/integration/Mvc/Micro/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Micro;
+namespace Phalcon\Tests\Integration\Mvc\Micro;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/AddCest.php b/tests/integration/Mvc/Router/AddCest.php
index d5e4611f8ff..dc4196d65c3 100644
--- a/tests/integration/Mvc/Router/AddCest.php
+++ b/tests/integration/Mvc/Router/AddCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddCest
 {
diff --git a/tests/integration/Mvc/Router/AddConnectCest.php b/tests/integration/Mvc/Router/AddConnectCest.php
index c4972f4003e..b33658da507 100644
--- a/tests/integration/Mvc/Router/AddConnectCest.php
+++ b/tests/integration/Mvc/Router/AddConnectCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddConnectCest
 {
diff --git a/tests/integration/Mvc/Router/AddDeleteCest.php b/tests/integration/Mvc/Router/AddDeleteCest.php
index aa1234d896e..262a117e6a3 100644
--- a/tests/integration/Mvc/Router/AddDeleteCest.php
+++ b/tests/integration/Mvc/Router/AddDeleteCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddDeleteCest
 {
diff --git a/tests/integration/Mvc/Router/AddGetCest.php b/tests/integration/Mvc/Router/AddGetCest.php
index 9960097534d..418b751947a 100644
--- a/tests/integration/Mvc/Router/AddGetCest.php
+++ b/tests/integration/Mvc/Router/AddGetCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddGetCest
 {
diff --git a/tests/integration/Mvc/Router/AddHeadCest.php b/tests/integration/Mvc/Router/AddHeadCest.php
index ac1002ca842..40594924ac2 100644
--- a/tests/integration/Mvc/Router/AddHeadCest.php
+++ b/tests/integration/Mvc/Router/AddHeadCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddHeadCest
 {
diff --git a/tests/integration/Mvc/Router/AddOptionsCest.php b/tests/integration/Mvc/Router/AddOptionsCest.php
index 099fecefd45..3436743b898 100644
--- a/tests/integration/Mvc/Router/AddOptionsCest.php
+++ b/tests/integration/Mvc/Router/AddOptionsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddOptionsCest
 {
diff --git a/tests/integration/Mvc/Router/AddPatchCest.php b/tests/integration/Mvc/Router/AddPatchCest.php
index 8b9590ef182..d5a1c563140 100644
--- a/tests/integration/Mvc/Router/AddPatchCest.php
+++ b/tests/integration/Mvc/Router/AddPatchCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPatchCest
 {
diff --git a/tests/integration/Mvc/Router/AddPostCest.php b/tests/integration/Mvc/Router/AddPostCest.php
index 20cab202a05..35297781d42 100644
--- a/tests/integration/Mvc/Router/AddPostCest.php
+++ b/tests/integration/Mvc/Router/AddPostCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPostCest
 {
diff --git a/tests/integration/Mvc/Router/AddPurgeCest.php b/tests/integration/Mvc/Router/AddPurgeCest.php
index 6fc46057acb..d65f0dc831f 100644
--- a/tests/integration/Mvc/Router/AddPurgeCest.php
+++ b/tests/integration/Mvc/Router/AddPurgeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPurgeCest
 {
diff --git a/tests/integration/Mvc/Router/AddPutCest.php b/tests/integration/Mvc/Router/AddPutCest.php
index 3c4e74c0920..b3fed33a5d8 100644
--- a/tests/integration/Mvc/Router/AddPutCest.php
+++ b/tests/integration/Mvc/Router/AddPutCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPutCest
 {
diff --git a/tests/integration/Mvc/Router/AddTraceCest.php b/tests/integration/Mvc/Router/AddTraceCest.php
index ba8dade6c62..c69abb81bb2 100644
--- a/tests/integration/Mvc/Router/AddTraceCest.php
+++ b/tests/integration/Mvc/Router/AddTraceCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddTraceCest
 {
diff --git a/tests/integration/Mvc/Router/Annotations/AddCest.php b/tests/integration/Mvc/Router/Annotations/AddCest.php
index 95966d57e96..8fe7dbe7e24 100644
--- a/tests/integration/Mvc/Router/Annotations/AddCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddConnectCest.php b/tests/integration/Mvc/Router/Annotations/AddConnectCest.php
index f9e2cbad936..8cc6800e650 100644
--- a/tests/integration/Mvc/Router/Annotations/AddConnectCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddConnectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddDeleteCest.php b/tests/integration/Mvc/Router/Annotations/AddDeleteCest.php
index 553e88fc081..b84ecd067cc 100644
--- a/tests/integration/Mvc/Router/Annotations/AddDeleteCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddDeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddGetCest.php b/tests/integration/Mvc/Router/Annotations/AddGetCest.php
index b373733a59f..afbe044f59a 100644
--- a/tests/integration/Mvc/Router/Annotations/AddGetCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddHeadCest.php b/tests/integration/Mvc/Router/Annotations/AddHeadCest.php
index 05a2023c9af..86890dede6e 100644
--- a/tests/integration/Mvc/Router/Annotations/AddHeadCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddHeadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddModuleResourceCest.php b/tests/integration/Mvc/Router/Annotations/AddModuleResourceCest.php
index c28456d834a..0957a0ceff2 100644
--- a/tests/integration/Mvc/Router/Annotations/AddModuleResourceCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddModuleResourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddOptionsCest.php b/tests/integration/Mvc/Router/Annotations/AddOptionsCest.php
index 8102c6e92b1..e1af33dfaa2 100644
--- a/tests/integration/Mvc/Router/Annotations/AddOptionsCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddPatchCest.php b/tests/integration/Mvc/Router/Annotations/AddPatchCest.php
index 49954042e76..a8f27edcbae 100644
--- a/tests/integration/Mvc/Router/Annotations/AddPatchCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddPatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddPostCest.php b/tests/integration/Mvc/Router/Annotations/AddPostCest.php
index 713a953746f..1ba2b545b31 100644
--- a/tests/integration/Mvc/Router/Annotations/AddPostCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddPostCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddPurgeCest.php b/tests/integration/Mvc/Router/Annotations/AddPurgeCest.php
index 0a072bd50dc..17fc3bed419 100644
--- a/tests/integration/Mvc/Router/Annotations/AddPurgeCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddPurgeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddPutCest.php b/tests/integration/Mvc/Router/Annotations/AddPutCest.php
index 931043ba434..a7ad596037d 100644
--- a/tests/integration/Mvc/Router/Annotations/AddPutCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddPutCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddResourceCest.php b/tests/integration/Mvc/Router/Annotations/AddResourceCest.php
index eff977848b6..4fed6ce5c09 100644
--- a/tests/integration/Mvc/Router/Annotations/AddResourceCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddResourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AddTraceCest.php b/tests/integration/Mvc/Router/Annotations/AddTraceCest.php
index c7996d58655..24398c32bb3 100644
--- a/tests/integration/Mvc/Router/Annotations/AddTraceCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AddTraceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/AttachCest.php b/tests/integration/Mvc/Router/Annotations/AttachCest.php
index 5475a983caf..f6b45c53b13 100644
--- a/tests/integration/Mvc/Router/Annotations/AttachCest.php
+++ b/tests/integration/Mvc/Router/Annotations/AttachCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/ClearCest.php b/tests/integration/Mvc/Router/Annotations/ClearCest.php
index b5925cd9f3f..75d4bc43b37 100644
--- a/tests/integration/Mvc/Router/Annotations/ClearCest.php
+++ b/tests/integration/Mvc/Router/Annotations/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/ConstructCest.php b/tests/integration/Mvc/Router/Annotations/ConstructCest.php
index 1b6d96c4eac..953ad18782c 100644
--- a/tests/integration/Mvc/Router/Annotations/ConstructCest.php
+++ b/tests/integration/Mvc/Router/Annotations/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetActionNameCest.php b/tests/integration/Mvc/Router/Annotations/GetActionNameCest.php
index c78ab415b73..66d9b633fcc 100644
--- a/tests/integration/Mvc/Router/Annotations/GetActionNameCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetControllerNameCest.php b/tests/integration/Mvc/Router/Annotations/GetControllerNameCest.php
index 2201cdf7c4c..e91d94cb253 100644
--- a/tests/integration/Mvc/Router/Annotations/GetControllerNameCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetDefaultsCest.php b/tests/integration/Mvc/Router/Annotations/GetDefaultsCest.php
index 6d3b7915cae..988399a80dd 100644
--- a/tests/integration/Mvc/Router/Annotations/GetDefaultsCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetDefaultsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetEventsManagerCest.php b/tests/integration/Mvc/Router/Annotations/GetEventsManagerCest.php
index 45e431b696a..5b82c8225d8 100644
--- a/tests/integration/Mvc/Router/Annotations/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetKeyRouteIdsCest.php b/tests/integration/Mvc/Router/Annotations/GetKeyRouteIdsCest.php
index 7c4d8d02675..b2f410fb6e1 100644
--- a/tests/integration/Mvc/Router/Annotations/GetKeyRouteIdsCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetKeyRouteIdsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetKeyRouteNamesCest.php b/tests/integration/Mvc/Router/Annotations/GetKeyRouteNamesCest.php
index 5123459dab4..9abc1ce03fe 100644
--- a/tests/integration/Mvc/Router/Annotations/GetKeyRouteNamesCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetKeyRouteNamesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetMatchedRouteCest.php b/tests/integration/Mvc/Router/Annotations/GetMatchedRouteCest.php
index 381dcd19a55..c7314def446 100644
--- a/tests/integration/Mvc/Router/Annotations/GetMatchedRouteCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetMatchedRouteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetMatchesCest.php b/tests/integration/Mvc/Router/Annotations/GetMatchesCest.php
index 519b5b7fa46..5d8318bbe55 100644
--- a/tests/integration/Mvc/Router/Annotations/GetMatchesCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetMatchesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetModuleNameCest.php b/tests/integration/Mvc/Router/Annotations/GetModuleNameCest.php
index 0f64a716e8d..a49cb698c39 100644
--- a/tests/integration/Mvc/Router/Annotations/GetModuleNameCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetNamespaceNameCest.php b/tests/integration/Mvc/Router/Annotations/GetNamespaceNameCest.php
index 29f670ecbbc..2d4783c90cb 100644
--- a/tests/integration/Mvc/Router/Annotations/GetNamespaceNameCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetParamsCest.php b/tests/integration/Mvc/Router/Annotations/GetParamsCest.php
index 3b6d799dbda..cd5d6cc57c0 100644
--- a/tests/integration/Mvc/Router/Annotations/GetParamsCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetResourcesCest.php b/tests/integration/Mvc/Router/Annotations/GetResourcesCest.php
index 104068debef..31e5e4529d7 100644
--- a/tests/integration/Mvc/Router/Annotations/GetResourcesCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetResourcesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetRouteByIdCest.php b/tests/integration/Mvc/Router/Annotations/GetRouteByIdCest.php
index 19c3d52d770..dd88e9a9401 100644
--- a/tests/integration/Mvc/Router/Annotations/GetRouteByIdCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetRouteByIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetRouteByNameCest.php b/tests/integration/Mvc/Router/Annotations/GetRouteByNameCest.php
index 972e02c4e66..088ca30742d 100644
--- a/tests/integration/Mvc/Router/Annotations/GetRouteByNameCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetRouteByNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetRoutesCest.php b/tests/integration/Mvc/Router/Annotations/GetRoutesCest.php
index bb140fee538..5dcdf5d0a59 100644
--- a/tests/integration/Mvc/Router/Annotations/GetRoutesCest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetRoutesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/GetSetDICest.php b/tests/integration/Mvc/Router/Annotations/GetSetDICest.php
index 8f8f293993b..12678e1a852 100644
--- a/tests/integration/Mvc/Router/Annotations/GetSetDICest.php
+++ b/tests/integration/Mvc/Router/Annotations/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/HandleCest.php b/tests/integration/Mvc/Router/Annotations/HandleCest.php
index ec4dceed0df..ea528aaf6a0 100644
--- a/tests/integration/Mvc/Router/Annotations/HandleCest.php
+++ b/tests/integration/Mvc/Router/Annotations/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/IsExactControllerNameCest.php b/tests/integration/Mvc/Router/Annotations/IsExactControllerNameCest.php
index b29c6dbfdb1..65635e2e8c1 100644
--- a/tests/integration/Mvc/Router/Annotations/IsExactControllerNameCest.php
+++ b/tests/integration/Mvc/Router/Annotations/IsExactControllerNameCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Annotations;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class IsExactControllerNameCest
 {
diff --git a/tests/integration/Mvc/Router/Annotations/MountCest.php b/tests/integration/Mvc/Router/Annotations/MountCest.php
index c47562e448a..1b7ec81ee89 100644
--- a/tests/integration/Mvc/Router/Annotations/MountCest.php
+++ b/tests/integration/Mvc/Router/Annotations/MountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/NotFoundCest.php b/tests/integration/Mvc/Router/Annotations/NotFoundCest.php
index ee050dfebea..c43a56f274c 100644
--- a/tests/integration/Mvc/Router/Annotations/NotFoundCest.php
+++ b/tests/integration/Mvc/Router/Annotations/NotFoundCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/ProcessActionAnnotationCest.php b/tests/integration/Mvc/Router/Annotations/ProcessActionAnnotationCest.php
index ef59bf832aa..9783c67df77 100644
--- a/tests/integration/Mvc/Router/Annotations/ProcessActionAnnotationCest.php
+++ b/tests/integration/Mvc/Router/Annotations/ProcessActionAnnotationCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/ProcessControllerAnnotationCest.php b/tests/integration/Mvc/Router/Annotations/ProcessControllerAnnotationCest.php
index 7116aee7819..8d4768af212 100644
--- a/tests/integration/Mvc/Router/Annotations/ProcessControllerAnnotationCest.php
+++ b/tests/integration/Mvc/Router/Annotations/ProcessControllerAnnotationCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/RemoveExtraSlashesCest.php b/tests/integration/Mvc/Router/Annotations/RemoveExtraSlashesCest.php
index 1e4aa67d5c5..6dd60e03d07 100644
--- a/tests/integration/Mvc/Router/Annotations/RemoveExtraSlashesCest.php
+++ b/tests/integration/Mvc/Router/Annotations/RemoveExtraSlashesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetActionPreformatCallbackCest.php b/tests/integration/Mvc/Router/Annotations/SetActionPreformatCallbackCest.php
index 9393f54ba5f..7b35cfd56c8 100644
--- a/tests/integration/Mvc/Router/Annotations/SetActionPreformatCallbackCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetActionPreformatCallbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Annotations;
diff --git a/tests/integration/Mvc/Router/Annotations/SetActionSuffixCest.php b/tests/integration/Mvc/Router/Annotations/SetActionSuffixCest.php
index d09ac10f0c8..d5645374dd2 100644
--- a/tests/integration/Mvc/Router/Annotations/SetActionSuffixCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetActionSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetControllerSuffixCest.php b/tests/integration/Mvc/Router/Annotations/SetControllerSuffixCest.php
index 50740913664..fc6d77590e1 100644
--- a/tests/integration/Mvc/Router/Annotations/SetControllerSuffixCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetControllerSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetDefaultActionCest.php b/tests/integration/Mvc/Router/Annotations/SetDefaultActionCest.php
index 0956c3bb35b..89a65800044 100644
--- a/tests/integration/Mvc/Router/Annotations/SetDefaultActionCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetDefaultControllerCest.php b/tests/integration/Mvc/Router/Annotations/SetDefaultControllerCest.php
index 0d63cca050c..0702aca1a59 100644
--- a/tests/integration/Mvc/Router/Annotations/SetDefaultControllerCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetDefaultControllerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetDefaultModuleCest.php b/tests/integration/Mvc/Router/Annotations/SetDefaultModuleCest.php
index 23f5d480362..96b19f89ad9 100644
--- a/tests/integration/Mvc/Router/Annotations/SetDefaultModuleCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetDefaultModuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetDefaultNamespaceCest.php b/tests/integration/Mvc/Router/Annotations/SetDefaultNamespaceCest.php
index 36cb64fe434..a4cabf05a35 100644
--- a/tests/integration/Mvc/Router/Annotations/SetDefaultNamespaceCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetDefaultsCest.php b/tests/integration/Mvc/Router/Annotations/SetDefaultsCest.php
index 256f58bbb45..695315aa78f 100644
--- a/tests/integration/Mvc/Router/Annotations/SetDefaultsCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetDefaultsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetEventsManagerCest.php b/tests/integration/Mvc/Router/Annotations/SetEventsManagerCest.php
index 7a70e77783b..4ff5e7d52ad 100644
--- a/tests/integration/Mvc/Router/Annotations/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetKeyRouteIdsCest.php b/tests/integration/Mvc/Router/Annotations/SetKeyRouteIdsCest.php
index f651b445040..7a3b979438d 100644
--- a/tests/integration/Mvc/Router/Annotations/SetKeyRouteIdsCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetKeyRouteIdsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/SetKeyRouteNamesCest.php b/tests/integration/Mvc/Router/Annotations/SetKeyRouteNamesCest.php
index e47e4d296e3..edbe0be83fa 100644
--- a/tests/integration/Mvc/Router/Annotations/SetKeyRouteNamesCest.php
+++ b/tests/integration/Mvc/Router/Annotations/SetKeyRouteNamesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Annotations/WasMatchedCest.php b/tests/integration/Mvc/Router/Annotations/WasMatchedCest.php
index 01660d65595..b4eb1167564 100644
--- a/tests/integration/Mvc/Router/Annotations/WasMatchedCest.php
+++ b/tests/integration/Mvc/Router/Annotations/WasMatchedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Router\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/AttachCest.php b/tests/integration/Mvc/Router/AttachCest.php
index 6af04744373..55d25a55973 100644
--- a/tests/integration/Mvc/Router/AttachCest.php
+++ b/tests/integration/Mvc/Router/AttachCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
 use Phalcon\Mvc\Router\Route;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AttachCest
 {
diff --git a/tests/integration/Mvc/Router/ClearCest.php b/tests/integration/Mvc/Router/ClearCest.php
index 59da7854419..0f21e579f70 100644
--- a/tests/integration/Mvc/Router/ClearCest.php
+++ b/tests/integration/Mvc/Router/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/ConstructCest.php b/tests/integration/Mvc/Router/ConstructCest.php
index 9e851f961dc..77178726ed6 100644
--- a/tests/integration/Mvc/Router/ConstructCest.php
+++ b/tests/integration/Mvc/Router/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetActionNameCest.php b/tests/integration/Mvc/Router/GetActionNameCest.php
index be558109ada..43cb52baec6 100644
--- a/tests/integration/Mvc/Router/GetActionNameCest.php
+++ b/tests/integration/Mvc/Router/GetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetControllerNameCest.php b/tests/integration/Mvc/Router/GetControllerNameCest.php
index c4d6787c34d..c1ead390ee5 100644
--- a/tests/integration/Mvc/Router/GetControllerNameCest.php
+++ b/tests/integration/Mvc/Router/GetControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetEventsManagerCest.php b/tests/integration/Mvc/Router/GetEventsManagerCest.php
index c8d22af74dd..e35b5b92497 100644
--- a/tests/integration/Mvc/Router/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/Router/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetKeyRouteIdsCest.php b/tests/integration/Mvc/Router/GetKeyRouteIdsCest.php
index cfb1eb1e51c..f576cf1d936 100644
--- a/tests/integration/Mvc/Router/GetKeyRouteIdsCest.php
+++ b/tests/integration/Mvc/Router/GetKeyRouteIdsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetKeyRouteNamesCest.php b/tests/integration/Mvc/Router/GetKeyRouteNamesCest.php
index d5b2ed46551..686ad5fa2f4 100644
--- a/tests/integration/Mvc/Router/GetKeyRouteNamesCest.php
+++ b/tests/integration/Mvc/Router/GetKeyRouteNamesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetMatchedRouteCest.php b/tests/integration/Mvc/Router/GetMatchedRouteCest.php
index 365231a3d2c..1fa4a3dc04f 100644
--- a/tests/integration/Mvc/Router/GetMatchedRouteCest.php
+++ b/tests/integration/Mvc/Router/GetMatchedRouteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetMatchesCest.php b/tests/integration/Mvc/Router/GetMatchesCest.php
index 9ecc3301802..4fae4617769 100644
--- a/tests/integration/Mvc/Router/GetMatchesCest.php
+++ b/tests/integration/Mvc/Router/GetMatchesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetModuleNameCest.php b/tests/integration/Mvc/Router/GetModuleNameCest.php
index 47d518104fa..0c7043a4dcb 100644
--- a/tests/integration/Mvc/Router/GetModuleNameCest.php
+++ b/tests/integration/Mvc/Router/GetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetNamespaceNameCest.php b/tests/integration/Mvc/Router/GetNamespaceNameCest.php
index 47c72cce835..ebc7acffb54 100644
--- a/tests/integration/Mvc/Router/GetNamespaceNameCest.php
+++ b/tests/integration/Mvc/Router/GetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetParamsCest.php b/tests/integration/Mvc/Router/GetParamsCest.php
index 217835b45d0..e6385fb212d 100644
--- a/tests/integration/Mvc/Router/GetParamsCest.php
+++ b/tests/integration/Mvc/Router/GetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/GetRouteByIdCest.php b/tests/integration/Mvc/Router/GetRouteByIdCest.php
index 791ac185699..ae9e7fd6566 100644
--- a/tests/integration/Mvc/Router/GetRouteByIdCest.php
+++ b/tests/integration/Mvc/Router/GetRouteByIdCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Route;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class GetRouteByIdCest
 {
diff --git a/tests/integration/Mvc/Router/GetRouteByNameCest.php b/tests/integration/Mvc/Router/GetRouteByNameCest.php
index 698cea049e7..9180902cc3b 100644
--- a/tests/integration/Mvc/Router/GetRouteByNameCest.php
+++ b/tests/integration/Mvc/Router/GetRouteByNameCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class GetRouteByNameCest
 {
diff --git a/tests/integration/Mvc/Router/GetRoutesCest.php b/tests/integration/Mvc/Router/GetRoutesCest.php
index 6bf6667ac35..85602715bf0 100644
--- a/tests/integration/Mvc/Router/GetRoutesCest.php
+++ b/tests/integration/Mvc/Router/GetRoutesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class GetRoutesCest
 {
diff --git a/tests/integration/Mvc/Router/GetSetDICest.php b/tests/integration/Mvc/Router/GetSetDICest.php
index faf7ba20053..ee74eb39a46 100644
--- a/tests/integration/Mvc/Router/GetSetDICest.php
+++ b/tests/integration/Mvc/Router/GetSetDICest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Mvc\Router;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetDICest
 {
diff --git a/tests/integration/Mvc/Router/GetSetDefaultsCest.php b/tests/integration/Mvc/Router/GetSetDefaultsCest.php
index 4ecee5b4e2b..a66f8b32e48 100644
--- a/tests/integration/Mvc/Router/GetSetDefaultsCest.php
+++ b/tests/integration/Mvc/Router/GetSetDefaultsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/Group/AddCest.php b/tests/integration/Mvc/Router/Group/AddCest.php
index 2ff6051e8af..f783778f5d0 100644
--- a/tests/integration/Mvc/Router/Group/AddCest.php
+++ b/tests/integration/Mvc/Router/Group/AddCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddConnectCest.php b/tests/integration/Mvc/Router/Group/AddConnectCest.php
index 1868e6368d0..1af4e3d60df 100644
--- a/tests/integration/Mvc/Router/Group/AddConnectCest.php
+++ b/tests/integration/Mvc/Router/Group/AddConnectCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddConnectCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddDeleteCest.php b/tests/integration/Mvc/Router/Group/AddDeleteCest.php
index 080f1a3664e..0a3fc2da6da 100644
--- a/tests/integration/Mvc/Router/Group/AddDeleteCest.php
+++ b/tests/integration/Mvc/Router/Group/AddDeleteCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddDeleteCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddGetCest.php b/tests/integration/Mvc/Router/Group/AddGetCest.php
index 90c8e1e3a97..9a5f83cc771 100644
--- a/tests/integration/Mvc/Router/Group/AddGetCest.php
+++ b/tests/integration/Mvc/Router/Group/AddGetCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddGetCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddHeadCest.php b/tests/integration/Mvc/Router/Group/AddHeadCest.php
index a3b4069c87f..2126df912ad 100644
--- a/tests/integration/Mvc/Router/Group/AddHeadCest.php
+++ b/tests/integration/Mvc/Router/Group/AddHeadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddHeadCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddOptionsCest.php b/tests/integration/Mvc/Router/Group/AddOptionsCest.php
index ba61703edae..6cf7fdbbc72 100644
--- a/tests/integration/Mvc/Router/Group/AddOptionsCest.php
+++ b/tests/integration/Mvc/Router/Group/AddOptionsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddOptionsCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddPatchCest.php b/tests/integration/Mvc/Router/Group/AddPatchCest.php
index 647cfb277f3..c7b9e6e0fab 100644
--- a/tests/integration/Mvc/Router/Group/AddPatchCest.php
+++ b/tests/integration/Mvc/Router/Group/AddPatchCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPatchCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddPostCest.php b/tests/integration/Mvc/Router/Group/AddPostCest.php
index ae1807ef56e..3ff7ed99c65 100644
--- a/tests/integration/Mvc/Router/Group/AddPostCest.php
+++ b/tests/integration/Mvc/Router/Group/AddPostCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPostCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddPurgeCest.php b/tests/integration/Mvc/Router/Group/AddPurgeCest.php
index 44fc28eb4a8..bfdf6382421 100644
--- a/tests/integration/Mvc/Router/Group/AddPurgeCest.php
+++ b/tests/integration/Mvc/Router/Group/AddPurgeCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPurgeCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddPutCest.php b/tests/integration/Mvc/Router/Group/AddPutCest.php
index 78249c2638c..143c00b8b24 100644
--- a/tests/integration/Mvc/Router/Group/AddPutCest.php
+++ b/tests/integration/Mvc/Router/Group/AddPutCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddPutCest
 {
diff --git a/tests/integration/Mvc/Router/Group/AddTraceCest.php b/tests/integration/Mvc/Router/Group/AddTraceCest.php
index bccc8c6ddf1..e42ab4df0ba 100644
--- a/tests/integration/Mvc/Router/Group/AddTraceCest.php
+++ b/tests/integration/Mvc/Router/Group/AddTraceCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class AddTraceCest
 {
diff --git a/tests/integration/Mvc/Router/Group/BeforeMatchCest.php b/tests/integration/Mvc/Router/Group/BeforeMatchCest.php
index d2b50b4e673..6b182f3fa08 100644
--- a/tests/integration/Mvc/Router/Group/BeforeMatchCest.php
+++ b/tests/integration/Mvc/Router/Group/BeforeMatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Group/ClearCest.php b/tests/integration/Mvc/Router/Group/ClearCest.php
index c804ff94c6f..c2cbc08b545 100644
--- a/tests/integration/Mvc/Router/Group/ClearCest.php
+++ b/tests/integration/Mvc/Router/Group/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
diff --git a/tests/integration/Mvc/Router/Group/ConstructCest.php b/tests/integration/Mvc/Router/Group/ConstructCest.php
index 8f7fdc12c27..b199c2e219a 100644
--- a/tests/integration/Mvc/Router/Group/ConstructCest.php
+++ b/tests/integration/Mvc/Router/Group/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Group/GetBeforeMatchCest.php b/tests/integration/Mvc/Router/Group/GetBeforeMatchCest.php
index 7cfaede7a03..c779a868de6 100644
--- a/tests/integration/Mvc/Router/Group/GetBeforeMatchCest.php
+++ b/tests/integration/Mvc/Router/Group/GetBeforeMatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Group/GetHostnameCest.php b/tests/integration/Mvc/Router/Group/GetHostnameCest.php
index ab0a18e33b7..26331b8ac9c 100644
--- a/tests/integration/Mvc/Router/Group/GetHostnameCest.php
+++ b/tests/integration/Mvc/Router/Group/GetHostnameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Group/GetPathsCest.php b/tests/integration/Mvc/Router/Group/GetPathsCest.php
index e5e32763e47..21d17caf0bc 100644
--- a/tests/integration/Mvc/Router/Group/GetPathsCest.php
+++ b/tests/integration/Mvc/Router/Group/GetPathsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Group/GetRoutesCest.php b/tests/integration/Mvc/Router/Group/GetRoutesCest.php
index 04ce8c5fd3f..7cf14911a79 100644
--- a/tests/integration/Mvc/Router/Group/GetRoutesCest.php
+++ b/tests/integration/Mvc/Router/Group/GetRoutesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
diff --git a/tests/integration/Mvc/Router/Group/GetSetPrefixCest.php b/tests/integration/Mvc/Router/Group/GetSetPrefixCest.php
index 910d0599410..bf5552eb94b 100644
--- a/tests/integration/Mvc/Router/Group/GetSetPrefixCest.php
+++ b/tests/integration/Mvc/Router/Group/GetSetPrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Group;
diff --git a/tests/integration/Mvc/Router/Group/SetHostnameCest.php b/tests/integration/Mvc/Router/Group/SetHostnameCest.php
index 068036d44bb..bcce0a6e488 100644
--- a/tests/integration/Mvc/Router/Group/SetHostnameCest.php
+++ b/tests/integration/Mvc/Router/Group/SetHostnameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Group/SetPathsCest.php b/tests/integration/Mvc/Router/Group/SetPathsCest.php
index d61e51a3acf..dce7296d1e9 100644
--- a/tests/integration/Mvc/Router/Group/SetPathsCest.php
+++ b/tests/integration/Mvc/Router/Group/SetPathsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Group;
+namespace Phalcon\Tests\Integration\Mvc\Router\Group;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/HandleCest.php b/tests/integration/Mvc/Router/HandleCest.php
index 2f8c423a4ee..c363bbb5014 100644
--- a/tests/integration/Mvc/Router/HandleCest.php
+++ b/tests/integration/Mvc/Router/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
diff --git a/tests/integration/Mvc/Router/IsExactControllerNameCest.php b/tests/integration/Mvc/Router/IsExactControllerNameCest.php
index a564cd052d5..3d7fbe2afd9 100644
--- a/tests/integration/Mvc/Router/IsExactControllerNameCest.php
+++ b/tests/integration/Mvc/Router/IsExactControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/MountCest.php b/tests/integration/Mvc/Router/MountCest.php
index 747714e8e26..acbf35117b1 100644
--- a/tests/integration/Mvc/Router/MountCest.php
+++ b/tests/integration/Mvc/Router/MountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/NotFoundCest.php b/tests/integration/Mvc/Router/NotFoundCest.php
index 74f7e6e2bfd..d0e6603f2de 100644
--- a/tests/integration/Mvc/Router/NotFoundCest.php
+++ b/tests/integration/Mvc/Router/NotFoundCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class NotFoundCest
 {
diff --git a/tests/integration/Mvc/Router/Refactor/AnnotationsCest.php b/tests/integration/Mvc/Router/Refactor/AnnotationsCest.php
index 128f21601b7..3d9123bbcf7 100644
--- a/tests/integration/Mvc/Router/Refactor/AnnotationsCest.php
+++ b/tests/integration/Mvc/Router/Refactor/AnnotationsCest.php
@@ -11,20 +11,20 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Router\Refactor;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Router\Annotations;
 use Phalcon\Mvc\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function is_object;
 
 /**
  * Class AnnotationsCest
  *
- * @package Phalcon\Test\Integration\Mvc\Router\Refactor
+ * @package Phalcon\Tests\Integration\Mvc\Router\Refactor
  * @todo: refactor
  */
 class AnnotationsCest
@@ -45,9 +45,9 @@ public function testRouterFullResources1(IntegrationTester $I)
 
         $router->setDI($container);
 
-        $router->addResource("Phalcon\Test\Controllers\Robots", '/');
-        $router->addResource("Phalcon\Test\Controllers\Products", '/products');
-        $router->addResource("Phalcon\Test\Controllers\About", '/about');
+        $router->addResource("Phalcon\Tests\Controllers\Robots", '/');
+        $router->addResource("Phalcon\Tests\Controllers\Products", '/products');
+        $router->addResource("Phalcon\Tests\Controllers\About", '/about');
 
         $router->handle('/products');
 
@@ -61,9 +61,9 @@ public function testRouterFullResources1(IntegrationTester $I)
 
         $router->setDI($container);
 
-        $router->addResource("Phalcon\Test\Controllers\Robots", '/');
-        $router->addResource("Phalcon\Test\Controllers\Products", '/products');
-        $router->addResource("Phalcon\Test\Controllers\About", '/about');
+        $router->addResource("Phalcon\Tests\Controllers\Robots", '/');
+        $router->addResource("Phalcon\Tests\Controllers\Products", '/products');
+        $router->addResource("Phalcon\Tests\Controllers\About", '/about');
 
         $router->handle('/about');
 
@@ -125,10 +125,10 @@ public function testRouterFullResources2(IntegrationTester $I, Example $example)
 
         $router->setDI($container);
 
-        $router->addResource("Phalcon\Test\Controllers\Robots");
-        $router->addResource("Phalcon\Test\Controllers\Products");
-        $router->addResource("Phalcon\Test\Controllers\About");
-        $router->addResource("Phalcon\Test\Controllers\Main");
+        $router->addResource("Phalcon\Tests\Controllers\Robots");
+        $router->addResource("Phalcon\Tests\Controllers\Products");
+        $router->addResource("Phalcon\Tests\Controllers\About");
+        $router->addResource("Phalcon\Tests\Controllers\Main");
 
         $router->handle('/');
 
diff --git a/tests/integration/Mvc/Router/Refactor/GroupCest.php b/tests/integration/Mvc/Router/Refactor/GroupCest.php
index 52413054e2e..2ecf383b5d0 100644
--- a/tests/integration/Mvc/Router/Refactor/GroupCest.php
+++ b/tests/integration/Mvc/Router/Refactor/GroupCest.php
@@ -11,19 +11,19 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Refactor;
+namespace Phalcon\Tests\Integration\Mvc\Router\Refactor;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Router;
 use Phalcon\Mvc\Router\Group;
 use Phalcon\Mvc\Router\Route;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GroupCest
  *
- * @package Phalcon\Test\Integration\Mvc\Router
+ * @package Phalcon\Tests\Integration\Mvc\Router
  * @todo: refactor
  */
 class GroupCest
diff --git a/tests/integration/Mvc/Router/RemoveExtraSlashesCest.php b/tests/integration/Mvc/Router/RemoveExtraSlashesCest.php
index 0386eb6f0a8..ee419fd19c7 100644
--- a/tests/integration/Mvc/Router/RemoveExtraSlashesCest.php
+++ b/tests/integration/Mvc/Router/RemoveExtraSlashesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class RemoveExtraSlashesCest
 {
diff --git a/tests/integration/Mvc/Router/Route/BeforeMatchCest.php b/tests/integration/Mvc/Router/Route/BeforeMatchCest.php
index d8a9f5a5615..ef9077c51f4 100644
--- a/tests/integration/Mvc/Router/Route/BeforeMatchCest.php
+++ b/tests/integration/Mvc/Router/Route/BeforeMatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/CompilePatternCest.php b/tests/integration/Mvc/Router/Route/CompilePatternCest.php
index 5477f18d3e1..0b4049563b5 100644
--- a/tests/integration/Mvc/Router/Route/CompilePatternCest.php
+++ b/tests/integration/Mvc/Router/Route/CompilePatternCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router\Route;
diff --git a/tests/integration/Mvc/Router/Route/ConstructCest.php b/tests/integration/Mvc/Router/Route/ConstructCest.php
index 192f50a4cae..6c5837b6038 100644
--- a/tests/integration/Mvc/Router/Route/ConstructCest.php
+++ b/tests/integration/Mvc/Router/Route/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/ConvertCest.php b/tests/integration/Mvc/Router/Route/ConvertCest.php
index ca2e1fafe17..b2f97e259b9 100644
--- a/tests/integration/Mvc/Router/Route/ConvertCest.php
+++ b/tests/integration/Mvc/Router/Route/ConvertCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/ExtractNamedParamsCest.php b/tests/integration/Mvc/Router/Route/ExtractNamedParamsCest.php
index f6e8d359483..977d9893035 100644
--- a/tests/integration/Mvc/Router/Route/ExtractNamedParamsCest.php
+++ b/tests/integration/Mvc/Router/Route/ExtractNamedParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetBeforeMatchCest.php b/tests/integration/Mvc/Router/Route/GetBeforeMatchCest.php
index f283145ee48..9e17ebc127f 100644
--- a/tests/integration/Mvc/Router/Route/GetBeforeMatchCest.php
+++ b/tests/integration/Mvc/Router/Route/GetBeforeMatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetCompiledPatternCest.php b/tests/integration/Mvc/Router/Route/GetCompiledPatternCest.php
index ee3dc8e51f5..f0196167509 100644
--- a/tests/integration/Mvc/Router/Route/GetCompiledPatternCest.php
+++ b/tests/integration/Mvc/Router/Route/GetCompiledPatternCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetConvertersCest.php b/tests/integration/Mvc/Router/Route/GetConvertersCest.php
index bf44a3628d9..36c8cfc0acb 100644
--- a/tests/integration/Mvc/Router/Route/GetConvertersCest.php
+++ b/tests/integration/Mvc/Router/Route/GetConvertersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetGroupCest.php b/tests/integration/Mvc/Router/Route/GetGroupCest.php
index 91447cd08b2..9930e49cd61 100644
--- a/tests/integration/Mvc/Router/Route/GetGroupCest.php
+++ b/tests/integration/Mvc/Router/Route/GetGroupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetHostnameCest.php b/tests/integration/Mvc/Router/Route/GetHostnameCest.php
index da52bfca73e..86c527e013f 100644
--- a/tests/integration/Mvc/Router/Route/GetHostnameCest.php
+++ b/tests/integration/Mvc/Router/Route/GetHostnameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetHttpMethodsCest.php b/tests/integration/Mvc/Router/Route/GetHttpMethodsCest.php
index 4e933cca755..3300f1d79be 100644
--- a/tests/integration/Mvc/Router/Route/GetHttpMethodsCest.php
+++ b/tests/integration/Mvc/Router/Route/GetHttpMethodsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetIdCest.php b/tests/integration/Mvc/Router/Route/GetIdCest.php
index 8c20554dbe2..a70d462f00c 100644
--- a/tests/integration/Mvc/Router/Route/GetIdCest.php
+++ b/tests/integration/Mvc/Router/Route/GetIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetMatchCest.php b/tests/integration/Mvc/Router/Route/GetMatchCest.php
index 1c19c1d03a3..c00c12e1046 100644
--- a/tests/integration/Mvc/Router/Route/GetMatchCest.php
+++ b/tests/integration/Mvc/Router/Route/GetMatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetNameCest.php b/tests/integration/Mvc/Router/Route/GetNameCest.php
index a2e44088c36..d876fc5afaa 100644
--- a/tests/integration/Mvc/Router/Route/GetNameCest.php
+++ b/tests/integration/Mvc/Router/Route/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetPathsCest.php b/tests/integration/Mvc/Router/Route/GetPathsCest.php
index df671e2ac7c..ae0cebf724e 100644
--- a/tests/integration/Mvc/Router/Route/GetPathsCest.php
+++ b/tests/integration/Mvc/Router/Route/GetPathsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetPatternCest.php b/tests/integration/Mvc/Router/Route/GetPatternCest.php
index 8630cfc51ba..8f2db6c16bf 100644
--- a/tests/integration/Mvc/Router/Route/GetPatternCest.php
+++ b/tests/integration/Mvc/Router/Route/GetPatternCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetReversedPathsCest.php b/tests/integration/Mvc/Router/Route/GetReversedPathsCest.php
index 6c70bcb4e87..31dce80eca9 100644
--- a/tests/integration/Mvc/Router/Route/GetReversedPathsCest.php
+++ b/tests/integration/Mvc/Router/Route/GetReversedPathsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetRouteIdCest.php b/tests/integration/Mvc/Router/Route/GetRouteIdCest.php
index 2d153fa656c..100da21a0af 100644
--- a/tests/integration/Mvc/Router/Route/GetRouteIdCest.php
+++ b/tests/integration/Mvc/Router/Route/GetRouteIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/GetRoutePathsCest.php b/tests/integration/Mvc/Router/Route/GetRoutePathsCest.php
index 90607b82e94..3e4e2318144 100644
--- a/tests/integration/Mvc/Router/Route/GetRoutePathsCest.php
+++ b/tests/integration/Mvc/Router/Route/GetRoutePathsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/MatchCest.php b/tests/integration/Mvc/Router/Route/MatchCest.php
index a7508d93fe2..01b67b9e35d 100644
--- a/tests/integration/Mvc/Router/Route/MatchCest.php
+++ b/tests/integration/Mvc/Router/Route/MatchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/ReConfigureCest.php b/tests/integration/Mvc/Router/Route/ReConfigureCest.php
index d0e1419fdfd..08b5975af09 100644
--- a/tests/integration/Mvc/Router/Route/ReConfigureCest.php
+++ b/tests/integration/Mvc/Router/Route/ReConfigureCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/ResetCest.php b/tests/integration/Mvc/Router/Route/ResetCest.php
index 14e3a19407f..341f12be9c1 100644
--- a/tests/integration/Mvc/Router/Route/ResetCest.php
+++ b/tests/integration/Mvc/Router/Route/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/SetGroupCest.php b/tests/integration/Mvc/Router/Route/SetGroupCest.php
index 88404d70560..dd414392c59 100644
--- a/tests/integration/Mvc/Router/Route/SetGroupCest.php
+++ b/tests/integration/Mvc/Router/Route/SetGroupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/SetHostnameCest.php b/tests/integration/Mvc/Router/Route/SetHostnameCest.php
index 1d2e1dcc578..f6a11f0d350 100644
--- a/tests/integration/Mvc/Router/Route/SetHostnameCest.php
+++ b/tests/integration/Mvc/Router/Route/SetHostnameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/SetHttpMethodsCest.php b/tests/integration/Mvc/Router/Route/SetHttpMethodsCest.php
index 5e51e1d3b00..7dedf06d184 100644
--- a/tests/integration/Mvc/Router/Route/SetHttpMethodsCest.php
+++ b/tests/integration/Mvc/Router/Route/SetHttpMethodsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/SetNameCest.php b/tests/integration/Mvc/Router/Route/SetNameCest.php
index 1af4eda60dd..fff7ec01e7f 100644
--- a/tests/integration/Mvc/Router/Route/SetNameCest.php
+++ b/tests/integration/Mvc/Router/Route/SetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/Route/ViaCest.php b/tests/integration/Mvc/Router/Route/ViaCest.php
index 27e74458bec..abc3c16cd4e 100644
--- a/tests/integration/Mvc/Router/Route/ViaCest.php
+++ b/tests/integration/Mvc/Router/Route/ViaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router\Route;
+namespace Phalcon\Tests\Integration\Mvc\Router\Route;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/SetDICest.php b/tests/integration/Mvc/Router/SetDICest.php
index 4f37498ce6a..7ab041a2612 100644
--- a/tests/integration/Mvc/Router/SetDICest.php
+++ b/tests/integration/Mvc/Router/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/SetDefaultActionCest.php b/tests/integration/Mvc/Router/SetDefaultActionCest.php
index 7dc042600a6..4262bf05be6 100644
--- a/tests/integration/Mvc/Router/SetDefaultActionCest.php
+++ b/tests/integration/Mvc/Router/SetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/SetDefaultControllerCest.php b/tests/integration/Mvc/Router/SetDefaultControllerCest.php
index 7706b6a69cf..6338e95e249 100644
--- a/tests/integration/Mvc/Router/SetDefaultControllerCest.php
+++ b/tests/integration/Mvc/Router/SetDefaultControllerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/SetDefaultModuleCest.php b/tests/integration/Mvc/Router/SetDefaultModuleCest.php
index 0eac8e4be75..ff630bac30e 100644
--- a/tests/integration/Mvc/Router/SetDefaultModuleCest.php
+++ b/tests/integration/Mvc/Router/SetDefaultModuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/SetDefaultNamespaceCest.php b/tests/integration/Mvc/Router/SetDefaultNamespaceCest.php
index 5c875283439..60702203c28 100644
--- a/tests/integration/Mvc/Router/SetDefaultNamespaceCest.php
+++ b/tests/integration/Mvc/Router/SetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 use Phalcon\Mvc\Router;
diff --git a/tests/integration/Mvc/Router/SetEventsManagerCest.php b/tests/integration/Mvc/Router/SetEventsManagerCest.php
index eb83b3a38b0..d5401d67192 100644
--- a/tests/integration/Mvc/Router/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/Router/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/SetKeyRouteIdsCest.php b/tests/integration/Mvc/Router/SetKeyRouteIdsCest.php
index b4dc2314d5b..589c2884c81 100644
--- a/tests/integration/Mvc/Router/SetKeyRouteIdsCest.php
+++ b/tests/integration/Mvc/Router/SetKeyRouteIdsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/SetKeyRouteNamesCest.php b/tests/integration/Mvc/Router/SetKeyRouteNamesCest.php
index 4413212b72c..0945ad84847 100644
--- a/tests/integration/Mvc/Router/SetKeyRouteNamesCest.php
+++ b/tests/integration/Mvc/Router/SetKeyRouteNamesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/Router/WasMatchedCest.php b/tests/integration/Mvc/Router/WasMatchedCest.php
index 5a3ef77dc73..f5f761e6e52 100644
--- a/tests/integration/Mvc/Router/WasMatchedCest.php
+++ b/tests/integration/Mvc/Router/WasMatchedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Router;
+namespace Phalcon\Tests\Integration\Mvc\Router;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/CleanTemplateAfterCest.php b/tests/integration/Mvc/View/CleanTemplateAfterCest.php
index f1bd4d814fd..17889a9ead6 100644
--- a/tests/integration/Mvc/View/CleanTemplateAfterCest.php
+++ b/tests/integration/Mvc/View/CleanTemplateAfterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/CleanTemplateBeforeCest.php b/tests/integration/Mvc/View/CleanTemplateBeforeCest.php
index fbfd6bac453..5e5acd4a29e 100644
--- a/tests/integration/Mvc/View/CleanTemplateBeforeCest.php
+++ b/tests/integration/Mvc/View/CleanTemplateBeforeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/ConstructCest.php b/tests/integration/Mvc/View/ConstructCest.php
index 4dc34f68751..88f3cc512d1 100644
--- a/tests/integration/Mvc/View/ConstructCest.php
+++ b/tests/integration/Mvc/View/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/DisableCest.php b/tests/integration/Mvc/View/DisableCest.php
index 7e23739e536..2c46e6a0058 100644
--- a/tests/integration/Mvc/View/DisableCest.php
+++ b/tests/integration/Mvc/View/DisableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/DisableLevelCest.php b/tests/integration/Mvc/View/DisableLevelCest.php
index 2bca6702d42..a16d030659a 100644
--- a/tests/integration/Mvc/View/DisableLevelCest.php
+++ b/tests/integration/Mvc/View/DisableLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/EnableCest.php b/tests/integration/Mvc/View/EnableCest.php
index b48b74681cd..97cdb1f3f61 100644
--- a/tests/integration/Mvc/View/EnableCest.php
+++ b/tests/integration/Mvc/View/EnableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Php/ConstructCest.php b/tests/integration/Mvc/View/Engine/Php/ConstructCest.php
index 5d36d66d00c..f7fd8414a14 100644
--- a/tests/integration/Mvc/View/Engine/Php/ConstructCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Php/GetContentCest.php b/tests/integration/Mvc/View/Engine/Php/GetContentCest.php
index 5ebd3ed01e3..fb60c36ffdb 100644
--- a/tests/integration/Mvc/View/Engine/Php/GetContentCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/Engine/Php/GetEventsManagerCest.php b/tests/integration/Mvc/View/Engine/Php/GetEventsManagerCest.php
index 470d2fd7139..2fec06d82b1 100644
--- a/tests/integration/Mvc/View/Engine/Php/GetEventsManagerCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Php/GetSetDICest.php b/tests/integration/Mvc/View/Engine/Php/GetSetDICest.php
index 1395ad0c898..33a9aa56919 100644
--- a/tests/integration/Mvc/View/Engine/Php/GetSetDICest.php
+++ b/tests/integration/Mvc/View/Engine/Php/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/Engine/Php/GetViewCest.php b/tests/integration/Mvc/View/Engine/Php/GetViewCest.php
index ab5f62b645d..4e94139d8db 100644
--- a/tests/integration/Mvc/View/Engine/Php/GetViewCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/GetViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/Engine/Php/PartialCest.php b/tests/integration/Mvc/View/Engine/Php/PartialCest.php
index a9cea1bc212..8057bb15b7f 100644
--- a/tests/integration/Mvc/View/Engine/Php/PartialCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/PartialCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Php/RenderCest.php b/tests/integration/Mvc/View/Engine/Php/RenderCest.php
index b4a4146d2de..0cca2e86d5e 100644
--- a/tests/integration/Mvc/View/Engine/Php/RenderCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/RenderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Php/SetEventsManagerCest.php b/tests/integration/Mvc/View/Engine/Php/SetEventsManagerCest.php
index 4ef8da51bea..5fca664bce6 100644
--- a/tests/integration/Mvc/View/Engine/Php/SetEventsManagerCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Php/UnderscoreGetCest.php b/tests/integration/Mvc/View/Engine/Php/UnderscoreGetCest.php
index ee6ce7ef605..fc3e0fff875 100644
--- a/tests/integration/Mvc/View/Engine/Php/UnderscoreGetCest.php
+++ b/tests/integration/Mvc/View/Engine/Php/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Php;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Php;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/CallMacroCest.php b/tests/integration/Mvc/View/Engine/Volt/CallMacroCest.php
index 31247df82b3..dbb865c0291 100644
--- a/tests/integration/Mvc/View/Engine/Volt/CallMacroCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/CallMacroCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/AddExtensionCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/AddExtensionCest.php
index 8d1d203ec77..2033b0a10c2 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/AddExtensionCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/AddExtensionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFilterCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFilterCest.php
index 4dd479f6e18..f2f2dde529a 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFilterCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFunctionCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFunctionCest.php
index 334b3925034..87028bd6276 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFunctionCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/AddFunctionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/AttributeReaderCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/AttributeReaderCest.php
index 6ffe86e30c8..0cb3bc2d835 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/AttributeReaderCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/AttributeReaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileAutoEscapeCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileAutoEscapeCest.php
index ebdb85bee6d..c4b564066ec 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileAutoEscapeCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileAutoEscapeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCallCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCallCest.php
index f7a599fc2a3..f8d90f1b2fb 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCallCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCallCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCaseCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCaseCest.php
index 28f49bff25c..cabc7931266 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCaseCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCaseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCest.php
index c205dd73770..335c9e96de8 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileDoCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileDoCest.php
index 3b59d81244a..fc20f9db921 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileDoCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileDoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileEchoCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileEchoCest.php
index d6ee2d04c0f..7fa53612a91 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileEchoCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileEchoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileElseIfCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileElseIfCest.php
index e582fdd331d..009561485f8 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileElseIfCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileElseIfCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Volt\Compiler;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileFileCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileFileCest.php
index de8b6e1a4b8..0981044559b 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileFileCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForElseCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForElseCest.php
index 8b210abeabb..6de50d6e8fa 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForElseCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForElseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForeachCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForeachCest.php
index e27bbeee980..4f52aecd93b 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForeachCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileForeachCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIfCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIfCest.php
index e3556f60ef2..3adce0d3b66 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIfCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIfCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Volt\Compiler;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIncludeCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIncludeCest.php
index de58e78b17d..81952bbf486 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIncludeCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileIncludeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileMacroCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileMacroCest.php
index 8421f199cef..a2edd26734e 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileMacroCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileMacroCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileReturnCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileReturnCest.php
index bcc1cb2ace9..c5f34776e45 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileReturnCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileReturnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSetCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSetCest.php
index f320afe55fa..e805561d9cc 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSetCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileStringCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileStringCest.php
index 162d87e29ae..3b073c50b46 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileStringCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSwitchCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSwitchCest.php
index b91c92b0c72..72b1ffba285 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSwitchCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSwitchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/ConstructCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/ConstructCest.php
index 27ab33294ac..27b5122aa3e 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/ConstructCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/ExpressionCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/ExpressionCest.php
index bb62def714a..6dabd7ddc25 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/ExpressionCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/ExpressionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/FireExtensionEventCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/FireExtensionEventCest.php
index b72ebdb08b8..ee9b11baeeb 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/FireExtensionEventCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/FireExtensionEventCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/FunctionCallCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/FunctionCallCest.php
index 5f6ba6c3540..2370cee0c2f 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/FunctionCallCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/FunctionCallCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Volt\Compiler;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class FunctionCallCest
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetCompiledTemplatePathCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetCompiledTemplatePathCest.php
index 981c2b1e767..15e6234a9b0 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetCompiledTemplatePathCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetCompiledTemplatePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetExtensionsCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetExtensionsCest.php
index ef9c86b5ded..02e7c187a33 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetExtensionsCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetExtensionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFiltersCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFiltersCest.php
index dfec4e2de34..0ae085e8dff 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFiltersCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFunctionsCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFunctionsCest.php
index 6f7b96179ed..42ae6c7de1f 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFunctionsCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetFunctionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionCest.php
index 5b12b80a21c..9063401aeee 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionsCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionsCest.php
index 40acb99e32d..1847a248671 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionsCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetSetDICest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetSetDICest.php
index 87314320aa9..4af04750aa0 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetSetDICest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetTemplatePathCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetTemplatePathCest.php
index 67db482cc68..027b2afc5b3 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetTemplatePathCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetTemplatePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetUniquePrefixCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetUniquePrefixCest.php
index 1f823787208..1bc6f723ec1 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/GetUniquePrefixCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/GetUniquePrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/ParseCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/ParseCest.php
index 6bed7c545d9..069e4dbd91a 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/ParseCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/ParseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/ResolveTestCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/ResolveTestCest.php
index 9d7b932e592..a568852d831 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/ResolveTestCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/ResolveTestCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionCest.php
index 97bf914a709..e83f86fa427 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionsCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionsCest.php
index 76204328651..24ca85e21e5 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionsCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/SetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/Compiler/SetUniquePrefixCest.php b/tests/integration/Mvc/View/Engine/Volt/Compiler/SetUniquePrefixCest.php
index ed87462758b..d784a48431f 100644
--- a/tests/integration/Mvc/View/Engine/Volt/Compiler/SetUniquePrefixCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/Compiler/SetUniquePrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt\Compiler;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/CompilerCest.php b/tests/integration/Mvc/View/Engine/Volt/CompilerCest.php
index f1f8e48dc8a..31a8657bf1a 100644
--- a/tests/integration/Mvc/View/Engine/Volt/CompilerCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/CompilerCest.php
@@ -15,7 +15,7 @@
  +------------------------------------------------------------------------+
  */
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use DateTime;
 use IntegrationTester;
@@ -31,7 +31,7 @@
 use stdClass;
 
 /**
- * Phalcon\Test\Integration\Mvc\View\Engine\Volt\CompilerCest
+ * Phalcon\Tests\Integration\Mvc\View\Engine\Volt\CompilerCest
  *
  * Test Compiler template engine
  */
diff --git a/tests/integration/Mvc/View/Engine/Volt/CompilerFilesCest.php b/tests/integration/Mvc/View/Engine/Volt/CompilerFilesCest.php
index 85cdf2c2095..beebf2b9cfe 100644
--- a/tests/integration/Mvc/View/Engine/Volt/CompilerFilesCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/CompilerFilesCest.php
@@ -15,7 +15,7 @@
  +------------------------------------------------------------------------+
  */
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
@@ -27,7 +27,7 @@
 use const PHP_EOL;
 
 /**
- * Phalcon\Test\Integration\Mvc\View\Engine\Volt\CompilerFilesCest
+ * Phalcon\Tests\Integration\Mvc\View\Engine\Volt\CompilerFilesCest
  *
  * Test working Compiler with files
  */
diff --git a/tests/integration/Mvc/View/Engine/Volt/ConstructCest.php b/tests/integration/Mvc/View/Engine/Volt/ConstructCest.php
index 31b1d4389ab..439161d86ee 100644
--- a/tests/integration/Mvc/View/Engine/Volt/ConstructCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/ConvertEncodingCest.php b/tests/integration/Mvc/View/Engine/Volt/ConvertEncodingCest.php
index 28523ac1107..a884ba29f88 100644
--- a/tests/integration/Mvc/View/Engine/Volt/ConvertEncodingCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/ConvertEncodingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/Engine/Volt/GetCompilerCest.php b/tests/integration/Mvc/View/Engine/Volt/GetCompilerCest.php
index e9747a363cc..29b248485fb 100644
--- a/tests/integration/Mvc/View/Engine/Volt/GetCompilerCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/GetCompilerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/GetContentCest.php b/tests/integration/Mvc/View/Engine/Volt/GetContentCest.php
index 8bc92a7b1e0..e863fbc4e22 100644
--- a/tests/integration/Mvc/View/Engine/Volt/GetContentCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/Engine/Volt/GetSetDICest.php b/tests/integration/Mvc/View/Engine/Volt/GetSetDICest.php
index d1cace4e785..baa9c867dfc 100644
--- a/tests/integration/Mvc/View/Engine/Volt/GetSetDICest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/Engine/Volt/GetSetEventsManagerCest.php b/tests/integration/Mvc/View/Engine/Volt/GetSetEventsManagerCest.php
index 83f6e1e2c65..c1e45dbb855 100644
--- a/tests/integration/Mvc/View/Engine/Volt/GetSetEventsManagerCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/GetSetEventsManagerCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Volt;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetEventsManagerCest
 {
diff --git a/tests/integration/Mvc/View/Engine/Volt/GetSetOptionsCest.php b/tests/integration/Mvc/View/Engine/Volt/GetSetOptionsCest.php
index a9fddac281a..006b8239186 100644
--- a/tests/integration/Mvc/View/Engine/Volt/GetSetOptionsCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/GetSetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/Engine/Volt/GetViewCest.php b/tests/integration/Mvc/View/Engine/Volt/GetViewCest.php
index 3c4c739e911..b629817c74e 100644
--- a/tests/integration/Mvc/View/Engine/Volt/GetViewCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/GetViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/Engine/Volt/IsIncludedCest.php b/tests/integration/Mvc/View/Engine/Volt/IsIncludedCest.php
index efb427fb9a5..3659f0f2daa 100644
--- a/tests/integration/Mvc/View/Engine/Volt/IsIncludedCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/IsIncludedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/LengthCest.php b/tests/integration/Mvc/View/Engine/Volt/LengthCest.php
index 0ad440249e7..feeb6e79cf2 100644
--- a/tests/integration/Mvc/View/Engine/Volt/LengthCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/LengthCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/PartialCest.php b/tests/integration/Mvc/View/Engine/Volt/PartialCest.php
index 85d65c63739..4581a8f3864 100644
--- a/tests/integration/Mvc/View/Engine/Volt/PartialCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/PartialCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/RenderCest.php b/tests/integration/Mvc/View/Engine/Volt/RenderCest.php
index 4821cd1ffc4..e1a35225952 100644
--- a/tests/integration/Mvc/View/Engine/Volt/RenderCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/RenderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Volt;
-use Phalcon\Test\Fixtures\Listener\ViewCompileListener;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Listener\ViewCompileListener;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Mvc/View/Engine/Volt/SliceCest.php b/tests/integration/Mvc/View/Engine/Volt/SliceCest.php
index b124f1615d6..76741fc2e7a 100644
--- a/tests/integration/Mvc/View/Engine/Volt/SliceCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/SliceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/SortCest.php b/tests/integration/Mvc/View/Engine/Volt/SortCest.php
index 26ede481ed2..fecefdf09c3 100644
--- a/tests/integration/Mvc/View/Engine/Volt/SortCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/SortCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Engine/Volt/UnderscoreGetCest.php b/tests/integration/Mvc/View/Engine/Volt/UnderscoreGetCest.php
index 610fd03636d..d5cc1e4cbff 100644
--- a/tests/integration/Mvc/View/Engine/Volt/UnderscoreGetCest.php
+++ b/tests/integration/Mvc/View/Engine/Volt/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Engine\Volt;
+namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/ExistsCest.php b/tests/integration/Mvc/View/ExistsCest.php
index 3708dc50489..fe8d12bd12e 100644
--- a/tests/integration/Mvc/View/ExistsCest.php
+++ b/tests/integration/Mvc/View/ExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/FinishCest.php b/tests/integration/Mvc/View/FinishCest.php
index 3c0515d745d..3dbdb8d8236 100644
--- a/tests/integration/Mvc/View/FinishCest.php
+++ b/tests/integration/Mvc/View/FinishCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/GetActionNameCest.php b/tests/integration/Mvc/View/GetActionNameCest.php
index d365691f03e..ec2067dedc2 100644
--- a/tests/integration/Mvc/View/GetActionNameCest.php
+++ b/tests/integration/Mvc/View/GetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/GetActiveRenderPathCest.php b/tests/integration/Mvc/View/GetActiveRenderPathCest.php
index dfbbfb937cd..710e5c2c699 100644
--- a/tests/integration/Mvc/View/GetActiveRenderPathCest.php
+++ b/tests/integration/Mvc/View/GetActiveRenderPathCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Events\Manager;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Mvc\View\AfterRenderListener;
+use Phalcon\Tests\Fixtures\Mvc\View\AfterRenderListener;
 
 use function dataDir;
 
diff --git a/tests/integration/Mvc/View/GetBasePathCest.php b/tests/integration/Mvc/View/GetBasePathCest.php
index 4895fe9b430..c767cbb5680 100644
--- a/tests/integration/Mvc/View/GetBasePathCest.php
+++ b/tests/integration/Mvc/View/GetBasePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/GetControllerNameCest.php b/tests/integration/Mvc/View/GetControllerNameCest.php
index 6856c5f9d8f..bc37fd4d123 100644
--- a/tests/integration/Mvc/View/GetControllerNameCest.php
+++ b/tests/integration/Mvc/View/GetControllerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/GetParamsToViewCest.php b/tests/integration/Mvc/View/GetParamsToViewCest.php
index ee6c367e4eb..310113eee87 100644
--- a/tests/integration/Mvc/View/GetParamsToViewCest.php
+++ b/tests/integration/Mvc/View/GetParamsToViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/GetPartialCest.php b/tests/integration/Mvc/View/GetPartialCest.php
index 9db3c35dfe2..b6008817f85 100644
--- a/tests/integration/Mvc/View/GetPartialCest.php
+++ b/tests/integration/Mvc/View/GetPartialCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/GetRegisteredEnginesCest.php b/tests/integration/Mvc/View/GetRegisteredEnginesCest.php
index c28ddd148e9..f51d31898d1 100644
--- a/tests/integration/Mvc/View/GetRegisteredEnginesCest.php
+++ b/tests/integration/Mvc/View/GetRegisteredEnginesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/GetRenderCest.php b/tests/integration/Mvc/View/GetRenderCest.php
index 1c7a44a5d48..23b89091d4e 100644
--- a/tests/integration/Mvc/View/GetRenderCest.php
+++ b/tests/integration/Mvc/View/GetRenderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/GetRenderLevelCest.php b/tests/integration/Mvc/View/GetRenderLevelCest.php
index f00ce85a977..0764fffb658 100644
--- a/tests/integration/Mvc/View/GetRenderLevelCest.php
+++ b/tests/integration/Mvc/View/GetRenderLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/GetSetContentCest.php b/tests/integration/Mvc/View/GetSetContentCest.php
index 6ad5670039c..07b652a03e3 100644
--- a/tests/integration/Mvc/View/GetSetContentCest.php
+++ b/tests/integration/Mvc/View/GetSetContentCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class GetSetContentCest
 {
diff --git a/tests/integration/Mvc/View/GetSetDICest.php b/tests/integration/Mvc/View/GetSetDICest.php
index 6f9fd2bae61..90f6c2f2006 100644
--- a/tests/integration/Mvc/View/GetSetDICest.php
+++ b/tests/integration/Mvc/View/GetSetDICest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Di;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GetSetDICest
diff --git a/tests/integration/Mvc/View/GetSetEventsManagerCest.php b/tests/integration/Mvc/View/GetSetEventsManagerCest.php
index d30115d44a9..702afa7f5c8 100644
--- a/tests/integration/Mvc/View/GetSetEventsManagerCest.php
+++ b/tests/integration/Mvc/View/GetSetEventsManagerCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GetSetEventsManagerCest
diff --git a/tests/integration/Mvc/View/GetSetLayoutCest.php b/tests/integration/Mvc/View/GetSetLayoutCest.php
index c34fd248188..df2dcdc5be1 100644
--- a/tests/integration/Mvc/View/GetSetLayoutCest.php
+++ b/tests/integration/Mvc/View/GetSetLayoutCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/GetSetLayoutsDirCest.php b/tests/integration/Mvc/View/GetSetLayoutsDirCest.php
index 2823186c8de..ef41fc3c471 100644
--- a/tests/integration/Mvc/View/GetSetLayoutsDirCest.php
+++ b/tests/integration/Mvc/View/GetSetLayoutsDirCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class GetSetLayoutsDirCest
 {
diff --git a/tests/integration/Mvc/View/GetSetMainViewCest.php b/tests/integration/Mvc/View/GetSetMainViewCest.php
index 16f549aa9cf..3d7847b5b07 100644
--- a/tests/integration/Mvc/View/GetSetMainViewCest.php
+++ b/tests/integration/Mvc/View/GetSetMainViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/GetSetPartialsDirCest.php b/tests/integration/Mvc/View/GetSetPartialsDirCest.php
index a887507554f..59502d4ff53 100644
--- a/tests/integration/Mvc/View/GetSetPartialsDirCest.php
+++ b/tests/integration/Mvc/View/GetSetPartialsDirCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class GetSetPartialsDirCest
 {
diff --git a/tests/integration/Mvc/View/GetSetRenderLevelCest.php b/tests/integration/Mvc/View/GetSetRenderLevelCest.php
index dd3847f1c5b..77f3c84140d 100644
--- a/tests/integration/Mvc/View/GetSetRenderLevelCest.php
+++ b/tests/integration/Mvc/View/GetSetRenderLevelCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Events\Manager;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Mvc\View\AfterRenderListener;
+use Phalcon\Tests\Fixtures\Mvc\View\AfterRenderListener;
 
 use function dataDir;
 
diff --git a/tests/integration/Mvc/View/GetSetVarCest.php b/tests/integration/Mvc/View/GetSetVarCest.php
index a74cbe64d9d..ada2c02d395 100644
--- a/tests/integration/Mvc/View/GetSetVarCest.php
+++ b/tests/integration/Mvc/View/GetSetVarCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class GetSetVarCest
 {
diff --git a/tests/integration/Mvc/View/GetSetViewsDirCest.php b/tests/integration/Mvc/View/GetSetViewsDirCest.php
index aaca678ccca..878ce175b23 100644
--- a/tests/integration/Mvc/View/GetSetViewsDirCest.php
+++ b/tests/integration/Mvc/View/GetSetViewsDirCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class GetSetViewsDirCest
 {
diff --git a/tests/integration/Mvc/View/IsDisabledCest.php b/tests/integration/Mvc/View/IsDisabledCest.php
index 2fbf80b5323..c1ecef1ff9a 100644
--- a/tests/integration/Mvc/View/IsDisabledCest.php
+++ b/tests/integration/Mvc/View/IsDisabledCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
diff --git a/tests/integration/Mvc/View/PartialCest.php b/tests/integration/Mvc/View/PartialCest.php
index dfbe3042011..65506987fa9 100644
--- a/tests/integration/Mvc/View/PartialCest.php
+++ b/tests/integration/Mvc/View/PartialCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/PickCest.php b/tests/integration/Mvc/View/PickCest.php
index 4b6668ddea0..5a247d57afa 100644
--- a/tests/integration/Mvc/View/PickCest.php
+++ b/tests/integration/Mvc/View/PickCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Di;
 use Phalcon\Helper\Str;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function dataDir;
 
diff --git a/tests/integration/Mvc/View/RegisterEnginesCest.php b/tests/integration/Mvc/View/RegisterEnginesCest.php
index c633cae921d..d5b4f6a6bc4 100644
--- a/tests/integration/Mvc/View/RegisterEnginesCest.php
+++ b/tests/integration/Mvc/View/RegisterEnginesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class RegisterEnginesCest
 {
diff --git a/tests/integration/Mvc/View/RenderCest.php b/tests/integration/Mvc/View/RenderCest.php
index fbaeb58f305..c9159ae082b 100644
--- a/tests/integration/Mvc/View/RenderCest.php
+++ b/tests/integration/Mvc/View/RenderCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class RenderCest
 {
diff --git a/tests/integration/Mvc/View/ResetCest.php b/tests/integration/Mvc/View/ResetCest.php
index 75b3e9ec261..e47d0d45882 100644
--- a/tests/integration/Mvc/View/ResetCest.php
+++ b/tests/integration/Mvc/View/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/SetBasePathCest.php b/tests/integration/Mvc/View/SetBasePathCest.php
index c26c1d4adca..42103911b1b 100644
--- a/tests/integration/Mvc/View/SetBasePathCest.php
+++ b/tests/integration/Mvc/View/SetBasePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/SetParamToViewCest.php b/tests/integration/Mvc/View/SetParamToViewCest.php
index e0450b9bf1a..49329e283ec 100644
--- a/tests/integration/Mvc/View/SetParamToViewCest.php
+++ b/tests/integration/Mvc/View/SetParamToViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/SetTemplateAfterCest.php b/tests/integration/Mvc/View/SetTemplateAfterCest.php
index a61c419baaf..bd9e2f25799 100644
--- a/tests/integration/Mvc/View/SetTemplateAfterCest.php
+++ b/tests/integration/Mvc/View/SetTemplateAfterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/SetTemplateBeforeCest.php b/tests/integration/Mvc/View/SetTemplateBeforeCest.php
index 0e46feb7028..3c6863a864e 100644
--- a/tests/integration/Mvc/View/SetTemplateBeforeCest.php
+++ b/tests/integration/Mvc/View/SetTemplateBeforeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/SetVarsCest.php b/tests/integration/Mvc/View/SetVarsCest.php
index 6010e7c6f91..7f46480d736 100644
--- a/tests/integration/Mvc/View/SetVarsCest.php
+++ b/tests/integration/Mvc/View/SetVarsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Simple/ConstructCest.php b/tests/integration/Mvc/View/Simple/ConstructCest.php
index ec7245264f4..e541d852f6d 100644
--- a/tests/integration/Mvc/View/Simple/ConstructCest.php
+++ b/tests/integration/Mvc/View/Simple/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/Simple/GetActiveRenderPathCest.php b/tests/integration/Mvc/View/Simple/GetActiveRenderPathCest.php
index ee9194e5b11..3ddab5a8f50 100644
--- a/tests/integration/Mvc/View/Simple/GetActiveRenderPathCest.php
+++ b/tests/integration/Mvc/View/Simple/GetActiveRenderPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Simple/GetRegisteredEnginesCest.php b/tests/integration/Mvc/View/Simple/GetRegisteredEnginesCest.php
index fc555e76d4c..d4628e77ea2 100644
--- a/tests/integration/Mvc/View/Simple/GetRegisteredEnginesCest.php
+++ b/tests/integration/Mvc/View/Simple/GetRegisteredEnginesCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Php;
 use Phalcon\Mvc\View\Engine\Volt;
-use Phalcon\Test\Fixtures\Mvc\View\Engine\Mustache;
-use Phalcon\Test\Fixtures\Mvc\View\Engine\Twig;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Mvc\View\Engine\Mustache;
+use Phalcon\Tests\Fixtures\Mvc\View\Engine\Twig;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetRegisteredEnginesCest
 {
diff --git a/tests/integration/Mvc/View/Simple/GetSetContentCest.php b/tests/integration/Mvc/View/Simple/GetSetContentCest.php
index adf4ee2a431..7fe850f8ce2 100644
--- a/tests/integration/Mvc/View/Simple/GetSetContentCest.php
+++ b/tests/integration/Mvc/View/Simple/GetSetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/Simple/GetSetDICest.php b/tests/integration/Mvc/View/Simple/GetSetDICest.php
index dc07a84cfe7..bb8a365132e 100644
--- a/tests/integration/Mvc/View/Simple/GetSetDICest.php
+++ b/tests/integration/Mvc/View/Simple/GetSetDICest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Di;
 use Phalcon\Mvc\View\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GetDICest
diff --git a/tests/integration/Mvc/View/Simple/GetSetEventsManagerCest.php b/tests/integration/Mvc/View/Simple/GetSetEventsManagerCest.php
index 8f7784986fc..6323f74baa5 100644
--- a/tests/integration/Mvc/View/Simple/GetSetEventsManagerCest.php
+++ b/tests/integration/Mvc/View/Simple/GetSetEventsManagerCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GetSetEventsManagerCest
diff --git a/tests/integration/Mvc/View/Simple/GetSetParamsToViewCest.php b/tests/integration/Mvc/View/Simple/GetSetParamsToViewCest.php
index 76b3f922130..fe85d23851e 100644
--- a/tests/integration/Mvc/View/Simple/GetSetParamsToViewCest.php
+++ b/tests/integration/Mvc/View/Simple/GetSetParamsToViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/Simple/GetSetVarCest.php b/tests/integration/Mvc/View/Simple/GetSetVarCest.php
index f0882e05ef7..c564ba9b1af 100644
--- a/tests/integration/Mvc/View/Simple/GetSetVarCest.php
+++ b/tests/integration/Mvc/View/Simple/GetSetVarCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/Simple/GetSetViewsDirCest.php b/tests/integration/Mvc/View/Simple/GetSetViewsDirCest.php
index bd2f1c519f8..f7895e1fb68 100644
--- a/tests/integration/Mvc/View/Simple/GetSetViewsDirCest.php
+++ b/tests/integration/Mvc/View/Simple/GetSetViewsDirCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/Simple/PartialCest.php b/tests/integration/Mvc/View/Simple/PartialCest.php
index 8813812e5fd..410940d36cb 100644
--- a/tests/integration/Mvc/View/Simple/PartialCest.php
+++ b/tests/integration/Mvc/View/Simple/PartialCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function ob_end_clean;
 use function ob_start;
diff --git a/tests/integration/Mvc/View/Simple/RegisterEnginesCest.php b/tests/integration/Mvc/View/Simple/RegisterEnginesCest.php
index 1d046ddcb0b..5dfa896541a 100644
--- a/tests/integration/Mvc/View/Simple/RegisterEnginesCest.php
+++ b/tests/integration/Mvc/View/Simple/RegisterEnginesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/Simple/RenderCest.php b/tests/integration/Mvc/View/Simple/RenderCest.php
index 7325604be3b..8d4aec5880c 100644
--- a/tests/integration/Mvc/View/Simple/RenderCest.php
+++ b/tests/integration/Mvc/View/Simple/RenderCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Engine\Volt;
 use Phalcon\Mvc\View\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 use function dataDir;
 use function ob_end_clean;
diff --git a/tests/integration/Mvc/View/Simple/SetVarsCest.php b/tests/integration/Mvc/View/Simple/SetVarsCest.php
index dce172f24c9..333239bef30 100644
--- a/tests/integration/Mvc/View/Simple/SetVarsCest.php
+++ b/tests/integration/Mvc/View/Simple/SetVarsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/Simple/UnderscoreGetSetCest.php b/tests/integration/Mvc/View/Simple/UnderscoreGetSetCest.php
index 228199b4bc2..07938212892 100644
--- a/tests/integration/Mvc/View/Simple/UnderscoreGetSetCest.php
+++ b/tests/integration/Mvc/View/Simple/UnderscoreGetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View\Simple;
+namespace Phalcon\Tests\Integration\Mvc\View\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\View\Simple;
diff --git a/tests/integration/Mvc/View/StartCest.php b/tests/integration/Mvc/View/StartCest.php
index 3ce68e071a0..5fc345dfe81 100644
--- a/tests/integration/Mvc/View/StartCest.php
+++ b/tests/integration/Mvc/View/StartCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Mvc/View/ToStringCest.php b/tests/integration/Mvc/View/ToStringCest.php
index 7f666ef74ec..8f1bfc4bb90 100644
--- a/tests/integration/Mvc/View/ToStringCest.php
+++ b/tests/integration/Mvc/View/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Mvc/View/UnderscoreGetSetCest.php b/tests/integration/Mvc/View/UnderscoreGetSetCest.php
index c07c1c2ec50..8f4f1b27a57 100644
--- a/tests/integration/Mvc/View/UnderscoreGetSetCest.php
+++ b/tests/integration/Mvc/View/UnderscoreGetSetCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class UnderscoreGetSetCest
 {
diff --git a/tests/integration/Mvc/View/UnderscoreIssetCest.php b/tests/integration/Mvc/View/UnderscoreIssetCest.php
index 4a7ddaeed77..4c5007f871a 100644
--- a/tests/integration/Mvc/View/UnderscoreIssetCest.php
+++ b/tests/integration/Mvc/View/UnderscoreIssetCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\View;
+namespace Phalcon\Tests\Integration\Mvc\View;
 
 use IntegrationTester;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Fixtures\Traits\ViewTrait;
+use Phalcon\Tests\Fixtures\Traits\ViewTrait;
 
 class UnderscoreIssetCest
 {
diff --git a/tests/integration/Paginator/Adapter/NativeArray/ConstructCest.php b/tests/integration/Paginator/Adapter/NativeArray/ConstructCest.php
index 4401dceb854..7937927c0d7 100644
--- a/tests/integration/Paginator/Adapter/NativeArray/ConstructCest.php
+++ b/tests/integration/Paginator/Adapter/NativeArray/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Adapter\NativeArray;
+namespace Phalcon\Tests\Integration\Paginator\Adapter\NativeArray;
 
 use ArgumentCountError;
 use BadMethodCallException;
diff --git a/tests/integration/Paginator/Adapter/NativeArray/GetLimitCest.php b/tests/integration/Paginator/Adapter/NativeArray/GetLimitCest.php
index c74a07d5c4c..f40b8fdb177 100644
--- a/tests/integration/Paginator/Adapter/NativeArray/GetLimitCest.php
+++ b/tests/integration/Paginator/Adapter/NativeArray/GetLimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Adapter\NativeArray;
+namespace Phalcon\Tests\Integration\Paginator\Adapter\NativeArray;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\NativeArray;
diff --git a/tests/integration/Paginator/Adapter/NativeArray/GetSetRepositoryCest.php b/tests/integration/Paginator/Adapter/NativeArray/GetSetRepositoryCest.php
index 4698ff417ef..68c8c09a940 100644
--- a/tests/integration/Paginator/Adapter/NativeArray/GetSetRepositoryCest.php
+++ b/tests/integration/Paginator/Adapter/NativeArray/GetSetRepositoryCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Adapter\NativeArray;
+namespace Phalcon\Tests\Integration\Paginator\Adapter\NativeArray;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\NativeArray;
 use Phalcon\Paginator\Repository;
-use Phalcon\Test\Fixtures\Paginator\Store;
+use Phalcon\Tests\Fixtures\Paginator\Store;
 
 use function array_fill;
 
diff --git a/tests/integration/Paginator/Adapter/NativeArray/PaginateCest.php b/tests/integration/Paginator/Adapter/NativeArray/PaginateCest.php
index 47d6f699ec7..85caafef4e5 100644
--- a/tests/integration/Paginator/Adapter/NativeArray/PaginateCest.php
+++ b/tests/integration/Paginator/Adapter/NativeArray/PaginateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Adapter\NativeArray;
+namespace Phalcon\Tests\Integration\Paginator\Adapter\NativeArray;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\NativeArray;
diff --git a/tests/integration/Paginator/Adapter/NativeArray/SetCurrentPageCest.php b/tests/integration/Paginator/Adapter/NativeArray/SetCurrentPageCest.php
index 435c1a53a36..74d61fb6405 100644
--- a/tests/integration/Paginator/Adapter/NativeArray/SetCurrentPageCest.php
+++ b/tests/integration/Paginator/Adapter/NativeArray/SetCurrentPageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Adapter\NativeArray;
+namespace Phalcon\Tests\Integration\Paginator\Adapter\NativeArray;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\NativeArray;
diff --git a/tests/integration/Paginator/Adapter/NativeArray/SetLimitCest.php b/tests/integration/Paginator/Adapter/NativeArray/SetLimitCest.php
index b5dbe1f49e7..53ee94f14ff 100644
--- a/tests/integration/Paginator/Adapter/NativeArray/SetLimitCest.php
+++ b/tests/integration/Paginator/Adapter/NativeArray/SetLimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Adapter\NativeArray;
+namespace Phalcon\Tests\Integration\Paginator\Adapter\NativeArray;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\NativeArray;
diff --git a/tests/integration/Paginator/PaginatorFactory/LoadCest.php b/tests/integration/Paginator/PaginatorFactory/LoadCest.php
index b6da13ec144..902b2afc233 100644
--- a/tests/integration/Paginator/PaginatorFactory/LoadCest.php
+++ b/tests/integration/Paginator/PaginatorFactory/LoadCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\PaginatorFactory;
+namespace Phalcon\Tests\Integration\Paginator\PaginatorFactory;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\QueryBuilder;
 use Phalcon\Paginator\PaginatorFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 
 class LoadCest
 {
diff --git a/tests/integration/Paginator/PaginatorFactory/NewInstanceCest.php b/tests/integration/Paginator/PaginatorFactory/NewInstanceCest.php
index 7d426c9d37e..c1c488bd982 100644
--- a/tests/integration/Paginator/PaginatorFactory/NewInstanceCest.php
+++ b/tests/integration/Paginator/PaginatorFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\PaginatorFactory;
+namespace Phalcon\Tests\Integration\Paginator\PaginatorFactory;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\AdapterInterface;
diff --git a/tests/integration/Paginator/Repository/GetAliasesCest.php b/tests/integration/Paginator/Repository/GetAliasesCest.php
index b7f1f66ff28..60d6540e8f1 100644
--- a/tests/integration/Paginator/Repository/GetAliasesCest.php
+++ b/tests/integration/Paginator/Repository/GetAliasesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetCurrentCest.php b/tests/integration/Paginator/Repository/GetCurrentCest.php
index 5974a353290..f3a91367ece 100644
--- a/tests/integration/Paginator/Repository/GetCurrentCest.php
+++ b/tests/integration/Paginator/Repository/GetCurrentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetFirstCest.php b/tests/integration/Paginator/Repository/GetFirstCest.php
index 1d968e039ff..d53781ec30f 100644
--- a/tests/integration/Paginator/Repository/GetFirstCest.php
+++ b/tests/integration/Paginator/Repository/GetFirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetItemsCest.php b/tests/integration/Paginator/Repository/GetItemsCest.php
index 7542fba1820..1994be9b462 100644
--- a/tests/integration/Paginator/Repository/GetItemsCest.php
+++ b/tests/integration/Paginator/Repository/GetItemsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetLastCest.php b/tests/integration/Paginator/Repository/GetLastCest.php
index 5e370a82698..342c1374526 100644
--- a/tests/integration/Paginator/Repository/GetLastCest.php
+++ b/tests/integration/Paginator/Repository/GetLastCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetLimitCest.php b/tests/integration/Paginator/Repository/GetLimitCest.php
index 4877ef1fd9c..919dc6bf914 100644
--- a/tests/integration/Paginator/Repository/GetLimitCest.php
+++ b/tests/integration/Paginator/Repository/GetLimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetNextCest.php b/tests/integration/Paginator/Repository/GetNextCest.php
index c3e6e8d1bfe..975c92fa7d5 100644
--- a/tests/integration/Paginator/Repository/GetNextCest.php
+++ b/tests/integration/Paginator/Repository/GetNextCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetPreviousCest.php b/tests/integration/Paginator/Repository/GetPreviousCest.php
index b461c1d3980..24d24d8e346 100644
--- a/tests/integration/Paginator/Repository/GetPreviousCest.php
+++ b/tests/integration/Paginator/Repository/GetPreviousCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/GetTotalItemsCest.php b/tests/integration/Paginator/Repository/GetTotalItemsCest.php
index d9da5f45ed5..41971df1cf3 100644
--- a/tests/integration/Paginator/Repository/GetTotalItemsCest.php
+++ b/tests/integration/Paginator/Repository/GetTotalItemsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/JsonSerializeCest.php b/tests/integration/Paginator/Repository/JsonSerializeCest.php
index a5f923c024a..84b9fd45e66 100644
--- a/tests/integration/Paginator/Repository/JsonSerializeCest.php
+++ b/tests/integration/Paginator/Repository/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 use Phalcon\Paginator\Adapter\NativeArray;
diff --git a/tests/integration/Paginator/Repository/SetAliasesCest.php b/tests/integration/Paginator/Repository/SetAliasesCest.php
index 146677ffcd9..5e7ec007009 100644
--- a/tests/integration/Paginator/Repository/SetAliasesCest.php
+++ b/tests/integration/Paginator/Repository/SetAliasesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/SetPropertiesCest.php b/tests/integration/Paginator/Repository/SetPropertiesCest.php
index c34a8a35e50..90a59136ab7 100644
--- a/tests/integration/Paginator/Repository/SetPropertiesCest.php
+++ b/tests/integration/Paginator/Repository/SetPropertiesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Paginator/Repository/UnderscoreGetCest.php b/tests/integration/Paginator/Repository/UnderscoreGetCest.php
index 8c92fd34b7d..129495defdd 100644
--- a/tests/integration/Paginator/Repository/UnderscoreGetCest.php
+++ b/tests/integration/Paginator/Repository/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Paginator\Repository;
+namespace Phalcon\Tests\Integration\Paginator\Repository;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Plugin/GetDICest.php b/tests/integration/Plugin/GetDICest.php
index 1d31f190d4a..02c3bf4748f 100644
--- a/tests/integration/Plugin/GetDICest.php
+++ b/tests/integration/Plugin/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Plugin;
+namespace Phalcon\Tests\Integration\Plugin;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Plugin/GetEventsManagerCest.php b/tests/integration/Plugin/GetEventsManagerCest.php
index c5323ac592d..5c1d1376e3f 100644
--- a/tests/integration/Plugin/GetEventsManagerCest.php
+++ b/tests/integration/Plugin/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Plugin;
+namespace Phalcon\Tests\Integration\Plugin;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Plugin/SetDICest.php b/tests/integration/Plugin/SetDICest.php
index 0e1b3418024..1d6560a5df4 100644
--- a/tests/integration/Plugin/SetDICest.php
+++ b/tests/integration/Plugin/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Plugin;
+namespace Phalcon\Tests\Integration\Plugin;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Plugin/SetEventsManagerCest.php b/tests/integration/Plugin/SetEventsManagerCest.php
index e0788e0700d..2ca88961c7f 100644
--- a/tests/integration/Plugin/SetEventsManagerCest.php
+++ b/tests/integration/Plugin/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Plugin;
+namespace Phalcon\Tests\Integration\Plugin;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Plugin/UnderscoreGetCest.php b/tests/integration/Plugin/UnderscoreGetCest.php
index e7a65549011..63c1f7a18bc 100644
--- a/tests/integration/Plugin/UnderscoreGetCest.php
+++ b/tests/integration/Plugin/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Plugin;
+namespace Phalcon\Tests\Integration\Plugin;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Session/Adapter/Libmemcached/CloseCest.php b/tests/integration/Session/Adapter/Libmemcached/CloseCest.php
index 83353784c0d..1c035ec83e8 100644
--- a/tests/integration/Session/Adapter/Libmemcached/CloseCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/CloseCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class CloseCest
 {
diff --git a/tests/integration/Session/Adapter/Libmemcached/ConstructCest.php b/tests/integration/Session/Adapter/Libmemcached/ConstructCest.php
index a0c10e84742..ab04f037f8e 100644
--- a/tests/integration/Session/Adapter/Libmemcached/ConstructCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
 use Phalcon\Session\Adapter\Libmemcached;
 use Phalcon\Storage\AdapterFactory;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use SessionHandlerInterface;
 
 class ConstructCest
diff --git a/tests/integration/Session/Adapter/Libmemcached/DestroyCest.php b/tests/integration/Session/Adapter/Libmemcached/DestroyCest.php
index ce4a0dbdd31..41fdb36ce0c 100644
--- a/tests/integration/Session/Adapter/Libmemcached/DestroyCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/DestroyCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Libmemcached/GcCest.php b/tests/integration/Session/Adapter/Libmemcached/GcCest.php
index ab3363a6227..9131bb7cd50 100644
--- a/tests/integration/Session/Adapter/Libmemcached/GcCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/GcCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function sleep;
 use function uniqid;
diff --git a/tests/integration/Session/Adapter/Libmemcached/OpenCest.php b/tests/integration/Session/Adapter/Libmemcached/OpenCest.php
index 3fdd548e048..3abed6a85f8 100644
--- a/tests/integration/Session/Adapter/Libmemcached/OpenCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/OpenCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class OpenCest
 {
diff --git a/tests/integration/Session/Adapter/Libmemcached/ReadCest.php b/tests/integration/Session/Adapter/Libmemcached/ReadCest.php
index 14b25f8ecba..2091db6a1a1 100644
--- a/tests/integration/Session/Adapter/Libmemcached/ReadCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/ReadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Libmemcached/WriteCest.php b/tests/integration/Session/Adapter/Libmemcached/WriteCest.php
index 4590a1c1d2f..fb2e1d528f3 100644
--- a/tests/integration/Session/Adapter/Libmemcached/WriteCest.php
+++ b/tests/integration/Session/Adapter/Libmemcached/WriteCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Session\Adapter\Libmemcached;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Noop/CloseCest.php b/tests/integration/Session/Adapter/Noop/CloseCest.php
index 88d1d41af67..03b49df3299 100644
--- a/tests/integration/Session/Adapter/Noop/CloseCest.php
+++ b/tests/integration/Session/Adapter/Noop/CloseCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class CloseCest
 {
diff --git a/tests/integration/Session/Adapter/Noop/ConstructCest.php b/tests/integration/Session/Adapter/Noop/ConstructCest.php
index 8c9c1ad903d..6c671032acb 100644
--- a/tests/integration/Session/Adapter/Noop/ConstructCest.php
+++ b/tests/integration/Session/Adapter/Noop/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 use SessionHandlerInterface;
 
 class ConstructCest
diff --git a/tests/integration/Session/Adapter/Noop/DestroyCest.php b/tests/integration/Session/Adapter/Noop/DestroyCest.php
index 79d0f9b636a..2da2b62b3b6 100644
--- a/tests/integration/Session/Adapter/Noop/DestroyCest.php
+++ b/tests/integration/Session/Adapter/Noop/DestroyCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class DestroyCest
 {
diff --git a/tests/integration/Session/Adapter/Noop/GcCest.php b/tests/integration/Session/Adapter/Noop/GcCest.php
index 18ecdb022b2..93934ea75f9 100644
--- a/tests/integration/Session/Adapter/Noop/GcCest.php
+++ b/tests/integration/Session/Adapter/Noop/GcCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class GcCest
 {
diff --git a/tests/integration/Session/Adapter/Noop/OpenCest.php b/tests/integration/Session/Adapter/Noop/OpenCest.php
index bd8a74d12e9..cd943fa6b11 100644
--- a/tests/integration/Session/Adapter/Noop/OpenCest.php
+++ b/tests/integration/Session/Adapter/Noop/OpenCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class OpenCest
 {
diff --git a/tests/integration/Session/Adapter/Noop/ReadCest.php b/tests/integration/Session/Adapter/Noop/ReadCest.php
index eb153dd9c2e..c366ab9cb34 100644
--- a/tests/integration/Session/Adapter/Noop/ReadCest.php
+++ b/tests/integration/Session/Adapter/Noop/ReadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Noop/WriteCest.php b/tests/integration/Session/Adapter/Noop/WriteCest.php
index 9064fe50bfd..8bd21c5a031 100644
--- a/tests/integration/Session/Adapter/Noop/WriteCest.php
+++ b/tests/integration/Session/Adapter/Noop/WriteCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Noop;
+namespace Phalcon\Tests\Integration\Session\Adapter\Noop;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Redis/CloseCest.php b/tests/integration/Session/Adapter/Redis/CloseCest.php
index 11113f6f89a..30039a78cd8 100644
--- a/tests/integration/Session/Adapter/Redis/CloseCest.php
+++ b/tests/integration/Session/Adapter/Redis/CloseCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class CloseCest
 {
diff --git a/tests/integration/Session/Adapter/Redis/ConstructCest.php b/tests/integration/Session/Adapter/Redis/ConstructCest.php
index cce80ce2fee..54ef2b4d5e9 100644
--- a/tests/integration/Session/Adapter/Redis/ConstructCest.php
+++ b/tests/integration/Session/Adapter/Redis/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
 use Phalcon\Session\Adapter\Redis;
 use Phalcon\Storage\AdapterFactory;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use SessionHandlerInterface;
 
 class ConstructCest
diff --git a/tests/integration/Session/Adapter/Redis/DestroyCest.php b/tests/integration/Session/Adapter/Redis/DestroyCest.php
index e3a1ac09dc3..7a00094f0f1 100644
--- a/tests/integration/Session/Adapter/Redis/DestroyCest.php
+++ b/tests/integration/Session/Adapter/Redis/DestroyCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Redis/GcCest.php b/tests/integration/Session/Adapter/Redis/GcCest.php
index a9029f21e3b..29e7c6e054c 100644
--- a/tests/integration/Session/Adapter/Redis/GcCest.php
+++ b/tests/integration/Session/Adapter/Redis/GcCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class GcCest
 {
diff --git a/tests/integration/Session/Adapter/Redis/OpenCest.php b/tests/integration/Session/Adapter/Redis/OpenCest.php
index 7303142446c..a7295f691f4 100644
--- a/tests/integration/Session/Adapter/Redis/OpenCest.php
+++ b/tests/integration/Session/Adapter/Redis/OpenCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class OpenCest
 {
diff --git a/tests/integration/Session/Adapter/Redis/ReadCest.php b/tests/integration/Session/Adapter/Redis/ReadCest.php
index 169fa989a99..20d456d0127 100644
--- a/tests/integration/Session/Adapter/Redis/ReadCest.php
+++ b/tests/integration/Session/Adapter/Redis/ReadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Redis/WriteCest.php b/tests/integration/Session/Adapter/Redis/WriteCest.php
index ca12f7580fb..f3a3633bb5e 100644
--- a/tests/integration/Session/Adapter/Redis/WriteCest.php
+++ b/tests/integration/Session/Adapter/Redis/WriteCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Session\Adapter\Redis;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Adapter/Stream/CloseCest.php b/tests/integration/Session/Adapter/Stream/CloseCest.php
index 901a5bcee36..1a8f7a5a611 100644
--- a/tests/integration/Session/Adapter/Stream/CloseCest.php
+++ b/tests/integration/Session/Adapter/Stream/CloseCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class CloseCest
 {
diff --git a/tests/integration/Session/Adapter/Stream/ConstructCest.php b/tests/integration/Session/Adapter/Stream/ConstructCest.php
index 38d95eb8b68..141e66793b5 100644
--- a/tests/integration/Session/Adapter/Stream/ConstructCest.php
+++ b/tests/integration/Session/Adapter/Stream/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 use SessionHandlerInterface;
 
 class ConstructCest
diff --git a/tests/integration/Session/Adapter/Stream/DestroyCest.php b/tests/integration/Session/Adapter/Stream/DestroyCest.php
index 588230b4b47..eb103fb235f 100644
--- a/tests/integration/Session/Adapter/Stream/DestroyCest.php
+++ b/tests/integration/Session/Adapter/Stream/DestroyCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function cacheDir;
 use function uniqid;
diff --git a/tests/integration/Session/Adapter/Stream/GcCest.php b/tests/integration/Session/Adapter/Stream/GcCest.php
index c3b89c0f66b..776f95d0e19 100644
--- a/tests/integration/Session/Adapter/Stream/GcCest.php
+++ b/tests/integration/Session/Adapter/Stream/GcCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function cacheDir;
 use function file_put_contents;
diff --git a/tests/integration/Session/Adapter/Stream/OpenCest.php b/tests/integration/Session/Adapter/Stream/OpenCest.php
index 22c2d6d0c97..b56574151c4 100644
--- a/tests/integration/Session/Adapter/Stream/OpenCest.php
+++ b/tests/integration/Session/Adapter/Stream/OpenCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class OpenCest
 {
diff --git a/tests/integration/Session/Adapter/Stream/ReadCest.php b/tests/integration/Session/Adapter/Stream/ReadCest.php
index 1f82d55507b..f10f858814b 100644
--- a/tests/integration/Session/Adapter/Stream/ReadCest.php
+++ b/tests/integration/Session/Adapter/Stream/ReadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function cacheDir;
 use function uniqid;
diff --git a/tests/integration/Session/Adapter/Stream/WriteCest.php b/tests/integration/Session/Adapter/Stream/WriteCest.php
index a0d301a7012..cc0b4577dbb 100644
--- a/tests/integration/Session/Adapter/Stream/WriteCest.php
+++ b/tests/integration/Session/Adapter/Stream/WriteCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Session\Adapter\Stream;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function cacheDir;
 use function uniqid;
diff --git a/tests/integration/Session/Bag/ClearCest.php b/tests/integration/Session/Bag/ClearCest.php
index ffdf690b991..02b0809b1be 100644
--- a/tests/integration/Session/Bag/ClearCest.php
+++ b/tests/integration/Session/Bag/ClearCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class ClearCest
 {
diff --git a/tests/integration/Session/Bag/ConstructCest.php b/tests/integration/Session/Bag/ConstructCest.php
index a83ad9a6f54..ac7699f798a 100644
--- a/tests/integration/Session/Bag/ConstructCest.php
+++ b/tests/integration/Session/Bag/ConstructCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class ConstructCest
 {
diff --git a/tests/integration/Session/Bag/CountCest.php b/tests/integration/Session/Bag/CountCest.php
index 2c4008c81d5..dfb09cb2c89 100644
--- a/tests/integration/Session/Bag/CountCest.php
+++ b/tests/integration/Session/Bag/CountCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class CountCest
 {
diff --git a/tests/integration/Session/Bag/GetCest.php b/tests/integration/Session/Bag/GetCest.php
index b393a6a805a..37a353e6c3d 100644
--- a/tests/integration/Session/Bag/GetCest.php
+++ b/tests/integration/Session/Bag/GetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class GetCest
 {
diff --git a/tests/integration/Session/Bag/GetIteratorCest.php b/tests/integration/Session/Bag/GetIteratorCest.php
index fccf4b2802c..c2aea7cb718 100644
--- a/tests/integration/Session/Bag/GetIteratorCest.php
+++ b/tests/integration/Session/Bag/GetIteratorCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class GetIteratorCest
 {
diff --git a/tests/integration/Session/Bag/GetSetDICest.php b/tests/integration/Session/Bag/GetSetDICest.php
index 5198dde6a7c..7db09bbf748 100644
--- a/tests/integration/Session/Bag/GetSetDICest.php
+++ b/tests/integration/Session/Bag/GetSetDICest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class GetSetDICest
 {
diff --git a/tests/integration/Session/Bag/HasCest.php b/tests/integration/Session/Bag/HasCest.php
index d9baaf8f537..f68c57bf222 100644
--- a/tests/integration/Session/Bag/HasCest.php
+++ b/tests/integration/Session/Bag/HasCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class HasCest
 {
diff --git a/tests/integration/Session/Bag/InitCest.php b/tests/integration/Session/Bag/InitCest.php
index 56e6fc9869b..2e05ab29f69 100644
--- a/tests/integration/Session/Bag/InitCest.php
+++ b/tests/integration/Session/Bag/InitCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class InitCest
 {
diff --git a/tests/integration/Session/Bag/JsonSerializeCest.php b/tests/integration/Session/Bag/JsonSerializeCest.php
index 64adbc61317..70c135ca2aa 100644
--- a/tests/integration/Session/Bag/JsonSerializeCest.php
+++ b/tests/integration/Session/Bag/JsonSerializeCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class JsonSerializeCest
 {
diff --git a/tests/integration/Session/Bag/RemoveCest.php b/tests/integration/Session/Bag/RemoveCest.php
index 049c9726eb5..b593f055e77 100644
--- a/tests/integration/Session/Bag/RemoveCest.php
+++ b/tests/integration/Session/Bag/RemoveCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class RemoveCest
 {
diff --git a/tests/integration/Session/Bag/SerializeCest.php b/tests/integration/Session/Bag/SerializeCest.php
index 76eaade820a..a8a69e01e09 100644
--- a/tests/integration/Session/Bag/SerializeCest.php
+++ b/tests/integration/Session/Bag/SerializeCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class SerializeCest
 {
diff --git a/tests/integration/Session/Bag/SetCest.php b/tests/integration/Session/Bag/SetCest.php
index 86fa3e5dadb..be33b92c781 100644
--- a/tests/integration/Session/Bag/SetCest.php
+++ b/tests/integration/Session/Bag/SetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class SetCest
 {
diff --git a/tests/integration/Session/Bag/ToArrayCest.php b/tests/integration/Session/Bag/ToArrayCest.php
index 7e1936985b5..8697485308f 100644
--- a/tests/integration/Session/Bag/ToArrayCest.php
+++ b/tests/integration/Session/Bag/ToArrayCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class ToArrayCest
 {
diff --git a/tests/integration/Session/Bag/ToJsonCest.php b/tests/integration/Session/Bag/ToJsonCest.php
index 9608f9a996b..952d4f4b68a 100644
--- a/tests/integration/Session/Bag/ToJsonCest.php
+++ b/tests/integration/Session/Bag/ToJsonCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class ToJsonCest
 {
diff --git a/tests/integration/Session/Bag/UnserializeCest.php b/tests/integration/Session/Bag/UnserializeCest.php
index bc01e883a64..1bbe2f03caa 100644
--- a/tests/integration/Session/Bag/UnserializeCest.php
+++ b/tests/integration/Session/Bag/UnserializeCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Bag;
+namespace Phalcon\Tests\Integration\Session\Bag;
 
 use IntegrationTester;
 use Phalcon\Session\Bag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionBagTrait;
 
 class UnserializeCest
 {
diff --git a/tests/integration/Session/Factory/LoadCest.php b/tests/integration/Session/Factory/LoadCest.php
index 05aa6c66784..8897564e6eb 100644
--- a/tests/integration/Session/Factory/LoadCest.php
+++ b/tests/integration/Session/Factory/LoadCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Factory;
+namespace Phalcon\Tests\Integration\Session\Factory;
 
 use IntegrationTester;
 use Phalcon\Session\Adapter\Files;
 use Phalcon\Session\Factory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 
 class LoadCest
 {
diff --git a/tests/integration/Session/Manager/ConstructCest.php b/tests/integration/Session/Manager/ConstructCest.php
index 737adcedd11..569f7eb78ad 100644
--- a/tests/integration/Session/Manager/ConstructCest.php
+++ b/tests/integration/Session/Manager/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Adapter\Noop;
 use Phalcon\Session\Manager;
 use Phalcon\Session\ManagerInterface;
-use Phalcon\Test\Fixtures\Session\ExtendedManager;
+use Phalcon\Tests\Fixtures\Session\ExtendedManager;
 use SessionHandlerInterface;
 
 class ConstructCest
diff --git a/tests/integration/Session/Manager/ExistsDestroyCest.php b/tests/integration/Session/Manager/ExistsDestroyCest.php
index 4f166aa4d5a..70b20aa54a1 100644
--- a/tests/integration/Session/Manager/ExistsDestroyCest.php
+++ b/tests/integration/Session/Manager/ExistsDestroyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ExistsDestroyCest
 {
diff --git a/tests/integration/Session/Manager/GetSetAdapterCest.php b/tests/integration/Session/Manager/GetSetAdapterCest.php
index a20c62114c7..ef4daf5a246 100644
--- a/tests/integration/Session/Manager/GetSetAdapterCest.php
+++ b/tests/integration/Session/Manager/GetSetAdapterCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 use SessionHandlerInterface;
 
 class GetSetAdapterCest
diff --git a/tests/integration/Session/Manager/GetSetCest.php b/tests/integration/Session/Manager/GetSetCest.php
index b6ce7d73860..0512f66f715 100644
--- a/tests/integration/Session/Manager/GetSetCest.php
+++ b/tests/integration/Session/Manager/GetSetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class GetSetCest
 {
diff --git a/tests/integration/Session/Manager/GetSetDICest.php b/tests/integration/Session/Manager/GetSetDICest.php
index 0477ee6ad5e..f991826f64b 100644
--- a/tests/integration/Session/Manager/GetSetDICest.php
+++ b/tests/integration/Session/Manager/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Di\FactoryDefault;
diff --git a/tests/integration/Session/Manager/GetSetIdCest.php b/tests/integration/Session/Manager/GetSetIdCest.php
index 5753748318f..dfb652b8f20 100644
--- a/tests/integration/Session/Manager/GetSetIdCest.php
+++ b/tests/integration/Session/Manager/GetSetIdCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 use function uniqid;
 
diff --git a/tests/integration/Session/Manager/GetSetNameCest.php b/tests/integration/Session/Manager/GetSetNameCest.php
index c0d6c7dc323..376a28da010 100644
--- a/tests/integration/Session/Manager/GetSetNameCest.php
+++ b/tests/integration/Session/Manager/GetSetNameCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use InvalidArgumentException;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 /**
  * Class GetSetNameCest
diff --git a/tests/integration/Session/Manager/GetSetOptionsCest.php b/tests/integration/Session/Manager/GetSetOptionsCest.php
index 3cff30ce800..c9458531295 100644
--- a/tests/integration/Session/Manager/GetSetOptionsCest.php
+++ b/tests/integration/Session/Manager/GetSetOptionsCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class GetSetOptionsCest
 {
diff --git a/tests/integration/Session/Manager/HasCest.php b/tests/integration/Session/Manager/HasCest.php
index a3bed9288e5..5464d67f074 100644
--- a/tests/integration/Session/Manager/HasCest.php
+++ b/tests/integration/Session/Manager/HasCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class HasCest
 {
diff --git a/tests/integration/Session/Manager/RegenerateIdCest.php b/tests/integration/Session/Manager/RegenerateIdCest.php
index 9cde7fa9d9d..9d0da11db24 100644
--- a/tests/integration/Session/Manager/RegenerateIdCest.php
+++ b/tests/integration/Session/Manager/RegenerateIdCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class RegenerateIdCest
 {
diff --git a/tests/integration/Session/Manager/RemoveCest.php b/tests/integration/Session/Manager/RemoveCest.php
index 4f91b79c689..06414ea6932 100644
--- a/tests/integration/Session/Manager/RemoveCest.php
+++ b/tests/integration/Session/Manager/RemoveCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class RemoveCest
 {
diff --git a/tests/integration/Session/Manager/StatusCest.php b/tests/integration/Session/Manager/StatusCest.php
index cbb27b03440..66298c2e1d0 100644
--- a/tests/integration/Session/Manager/StatusCest.php
+++ b/tests/integration/Session/Manager/StatusCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class StatusCest
 {
diff --git a/tests/integration/Session/Manager/UnderscoreGetSetCest.php b/tests/integration/Session/Manager/UnderscoreGetSetCest.php
index 1a2b080b001..83cec84ec7a 100644
--- a/tests/integration/Session/Manager/UnderscoreGetSetCest.php
+++ b/tests/integration/Session/Manager/UnderscoreGetSetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class UnderscoreGetSetCest
 {
diff --git a/tests/integration/Session/Manager/UnderscoreIssetCest.php b/tests/integration/Session/Manager/UnderscoreIssetCest.php
index 0e6112cdc0e..26fed8193d1 100644
--- a/tests/integration/Session/Manager/UnderscoreIssetCest.php
+++ b/tests/integration/Session/Manager/UnderscoreIssetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class UnderscoreIssetCest
 {
diff --git a/tests/integration/Session/Manager/UnderscoreUnsetCest.php b/tests/integration/Session/Manager/UnderscoreUnsetCest.php
index 45a80563aec..855e7e3019d 100644
--- a/tests/integration/Session/Manager/UnderscoreUnsetCest.php
+++ b/tests/integration/Session/Manager/UnderscoreUnsetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Session\Manager;
+namespace Phalcon\Tests\Integration\Session\Manager;
 
 use IntegrationTester;
 use Phalcon\Session\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\SessionTrait;
 
 class UnderscoreUnsetCest
 {
diff --git a/tests/integration/Storage/Adapter/Apcu/DecrementCest.php b/tests/integration/Storage/Adapter/Apcu/DecrementCest.php
index 4b54de9fa43..5f2fcc1ca85 100644
--- a/tests/integration/Storage/Adapter/Apcu/DecrementCest.php
+++ b/tests/integration/Storage/Adapter/Apcu/DecrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Apcu;
 
 use Exception;
 use Phalcon\Storage\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 use IntegrationTester;
 
 class DecrementCest
diff --git a/tests/integration/Storage/Adapter/Apcu/GetKeysCest.php b/tests/integration/Storage/Adapter/Apcu/GetKeysCest.php
index f5f26e27b75..98329ce4961 100644
--- a/tests/integration/Storage/Adapter/Apcu/GetKeysCest.php
+++ b/tests/integration/Storage/Adapter/Apcu/GetKeysCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Apcu;
 
 use Phalcon\Storage\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 use IntegrationTester;
 
 class GetKeysCest
diff --git a/tests/integration/Storage/Adapter/Apcu/GetSetCest.php b/tests/integration/Storage/Adapter/Apcu/GetSetCest.php
index e45274b84ce..912830775b2 100644
--- a/tests/integration/Storage/Adapter/Apcu/GetSetCest.php
+++ b/tests/integration/Storage/Adapter/Apcu/GetSetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Apcu;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 use stdClass;
 use IntegrationTester;
 
diff --git a/tests/integration/Storage/Adapter/Apcu/IncrementCest.php b/tests/integration/Storage/Adapter/Apcu/IncrementCest.php
index b4a84b2c799..ef2fc4f84ef 100644
--- a/tests/integration/Storage/Adapter/Apcu/IncrementCest.php
+++ b/tests/integration/Storage/Adapter/Apcu/IncrementCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Apcu;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Apcu;
 
 use Phalcon\Storage\Adapter\Apcu;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\ApcuTrait;
+use Phalcon\Tests\Fixtures\Traits\ApcuTrait;
 use IntegrationTester;
 
 class IncrementCest
diff --git a/tests/integration/Storage/Adapter/ClearCest.php b/tests/integration/Storage/Adapter/ClearCest.php
index 39931d0e70d..c50f834d49c 100644
--- a/tests/integration/Storage/Adapter/ClearCest.php
+++ b/tests/integration/Storage/Adapter/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Apcu;
diff --git a/tests/integration/Storage/Adapter/ConstructCest.php b/tests/integration/Storage/Adapter/ConstructCest.php
index d4a8ff48aa6..a28aa2b8642 100644
--- a/tests/integration/Storage/Adapter/ConstructCest.php
+++ b/tests/integration/Storage/Adapter/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\AdapterInterface;
diff --git a/tests/integration/Storage/Adapter/DeleteCest.php b/tests/integration/Storage/Adapter/DeleteCest.php
index 17ce5050ede..6a71b8c8c20 100644
--- a/tests/integration/Storage/Adapter/DeleteCest.php
+++ b/tests/integration/Storage/Adapter/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Apcu;
diff --git a/tests/integration/Storage/Adapter/GetAdapterCest.php b/tests/integration/Storage/Adapter/GetAdapterCest.php
index c4c6c897dc0..abb7f436d71 100644
--- a/tests/integration/Storage/Adapter/GetAdapterCest.php
+++ b/tests/integration/Storage/Adapter/GetAdapterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Memcached as NativeMemcached;
diff --git a/tests/integration/Storage/Adapter/GetPrefixCest.php b/tests/integration/Storage/Adapter/GetPrefixCest.php
index cf16248b352..c4370f246ee 100644
--- a/tests/integration/Storage/Adapter/GetPrefixCest.php
+++ b/tests/integration/Storage/Adapter/GetPrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Apcu;
diff --git a/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php b/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php
index cafe2b7879a..6ece10b8e3e 100644
--- a/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php
+++ b/tests/integration/Storage/Adapter/GetSetDefaultSerializerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Apcu;
diff --git a/tests/integration/Storage/Adapter/HasCest.php b/tests/integration/Storage/Adapter/HasCest.php
index 66bae102c06..ccc815fceb7 100644
--- a/tests/integration/Storage/Adapter/HasCest.php
+++ b/tests/integration/Storage/Adapter/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter;
+namespace Phalcon\Tests\Integration\Storage\Adapter;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Apcu;
diff --git a/tests/integration/Storage/Adapter/Libmemcached/DecrementCest.php b/tests/integration/Storage/Adapter/Libmemcached/DecrementCest.php
index 7b316e862a7..149987079f3 100644
--- a/tests/integration/Storage/Adapter/Libmemcached/DecrementCest.php
+++ b/tests/integration/Storage/Adapter/Libmemcached/DecrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Libmemcached;
 
 use Phalcon\Storage\Adapter\Libmemcached;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 use IntegrationTester;
 
 use function getOptionsLibmemcached;
diff --git a/tests/integration/Storage/Adapter/Libmemcached/GetKeysCest.php b/tests/integration/Storage/Adapter/Libmemcached/GetKeysCest.php
index 49e898af84b..c5ffd2abeda 100644
--- a/tests/integration/Storage/Adapter/Libmemcached/GetKeysCest.php
+++ b/tests/integration/Storage/Adapter/Libmemcached/GetKeysCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Libmemcached;
 
 use Phalcon\Storage\Adapter\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 use IntegrationTester;
 
 use function getOptionsLibmemcached;
diff --git a/tests/integration/Storage/Adapter/Libmemcached/GetSetCest.php b/tests/integration/Storage/Adapter/Libmemcached/GetSetCest.php
index 987f8e547d2..d913714a08c 100644
--- a/tests/integration/Storage/Adapter/Libmemcached/GetSetCest.php
+++ b/tests/integration/Storage/Adapter/Libmemcached/GetSetCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Libmemcached;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Libmemcached;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 use stdClass;
 use IntegrationTester;
 
diff --git a/tests/integration/Storage/Adapter/Libmemcached/IncrementCest.php b/tests/integration/Storage/Adapter/Libmemcached/IncrementCest.php
index 68dda02f00b..6719f653f84 100644
--- a/tests/integration/Storage/Adapter/Libmemcached/IncrementCest.php
+++ b/tests/integration/Storage/Adapter/Libmemcached/IncrementCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Libmemcached;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Libmemcached;
 
 use Phalcon\Storage\Adapter\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\LibmemcachedTrait;
+use Phalcon\Tests\Fixtures\Traits\LibmemcachedTrait;
 use IntegrationTester;
 
 use function getOptionsLibmemcached;
diff --git a/tests/integration/Storage/Adapter/Memory/DecrementCest.php b/tests/integration/Storage/Adapter/Memory/DecrementCest.php
index c127a637434..194a343367a 100644
--- a/tests/integration/Storage/Adapter/Memory/DecrementCest.php
+++ b/tests/integration/Storage/Adapter/Memory/DecrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Memory;
 
 use Phalcon\Storage\Adapter\Memory;
 use Phalcon\Storage\SerializerFactory;
diff --git a/tests/integration/Storage/Adapter/Memory/GetKeysCest.php b/tests/integration/Storage/Adapter/Memory/GetKeysCest.php
index f6ad9faa7d3..0bd21bda6fa 100644
--- a/tests/integration/Storage/Adapter/Memory/GetKeysCest.php
+++ b/tests/integration/Storage/Adapter/Memory/GetKeysCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Memory;
 
 use Phalcon\Storage\Adapter\Memory;
 use Phalcon\Storage\SerializerFactory;
diff --git a/tests/integration/Storage/Adapter/Memory/GetSetCest.php b/tests/integration/Storage/Adapter/Memory/GetSetCest.php
index a3bef5f1536..6351d57d392 100644
--- a/tests/integration/Storage/Adapter/Memory/GetSetCest.php
+++ b/tests/integration/Storage/Adapter/Memory/GetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Memory;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Memory;
diff --git a/tests/integration/Storage/Adapter/Memory/IncrementCest.php b/tests/integration/Storage/Adapter/Memory/IncrementCest.php
index 00be25e5181..3e7c68b0fad 100644
--- a/tests/integration/Storage/Adapter/Memory/IncrementCest.php
+++ b/tests/integration/Storage/Adapter/Memory/IncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Memory;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Memory;
 
 use Phalcon\Storage\Adapter\Memory;
 use Phalcon\Storage\SerializerFactory;
diff --git a/tests/integration/Storage/Adapter/Redis/DecrementCest.php b/tests/integration/Storage/Adapter/Redis/DecrementCest.php
index 8b3201d6da0..ab8d331b901 100644
--- a/tests/integration/Storage/Adapter/Redis/DecrementCest.php
+++ b/tests/integration/Storage/Adapter/Redis/DecrementCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Redis;
 
 use Phalcon\Storage\Adapter\Redis;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 use IntegrationTester;
 
 use function getOptionsRedis;
diff --git a/tests/integration/Storage/Adapter/Redis/GetKeysCest.php b/tests/integration/Storage/Adapter/Redis/GetKeysCest.php
index b72fa242f3e..a4f302c1edf 100644
--- a/tests/integration/Storage/Adapter/Redis/GetKeysCest.php
+++ b/tests/integration/Storage/Adapter/Redis/GetKeysCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Redis;
 
 use Phalcon\Storage\Adapter\Redis;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 use IntegrationTester;
 
 use function getOptionsRedis;
diff --git a/tests/integration/Storage/Adapter/Redis/GetSetCest.php b/tests/integration/Storage/Adapter/Redis/GetSetCest.php
index 81b8eeee50f..a6a6e76c981 100644
--- a/tests/integration/Storage/Adapter/Redis/GetSetCest.php
+++ b/tests/integration/Storage/Adapter/Redis/GetSetCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Redis;
 
 use Codeception\Example;
 use Phalcon\Storage\Adapter\Redis;
 use Phalcon\Storage\Exception;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 use stdClass;
 use IntegrationTester;
 
diff --git a/tests/integration/Storage/Adapter/Redis/IncrementCest.php b/tests/integration/Storage/Adapter/Redis/IncrementCest.php
index 1794db8be15..404b511108f 100644
--- a/tests/integration/Storage/Adapter/Redis/IncrementCest.php
+++ b/tests/integration/Storage/Adapter/Redis/IncrementCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Redis;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Redis;
 
 use Phalcon\Storage\Adapter\Redis;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\RedisTrait;
+use Phalcon\Tests\Fixtures\Traits\RedisTrait;
 use IntegrationTester;
 
 use function getOptionsRedis;
diff --git a/tests/integration/Storage/Adapter/Stream/DecrementCest.php b/tests/integration/Storage/Adapter/Stream/DecrementCest.php
index 9897d0e7f87..083474439dd 100644
--- a/tests/integration/Storage/Adapter/Stream/DecrementCest.php
+++ b/tests/integration/Storage/Adapter/Stream/DecrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Stream;
 
 use Phalcon\Storage\Adapter\Stream;
 use Phalcon\Storage\Exception;
diff --git a/tests/integration/Storage/Adapter/Stream/GetKeysCest.php b/tests/integration/Storage/Adapter/Stream/GetKeysCest.php
index 31437a645e5..5ea17c67130 100644
--- a/tests/integration/Storage/Adapter/Stream/GetKeysCest.php
+++ b/tests/integration/Storage/Adapter/Stream/GetKeysCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Stream;
 
 use Phalcon\Storage\Adapter\Stream;
 use Phalcon\Storage\SerializerFactory;
diff --git a/tests/integration/Storage/Adapter/Stream/GetSetCest.php b/tests/integration/Storage/Adapter/Stream/GetSetCest.php
index c8acbc6f156..e143fe6c7d8 100644
--- a/tests/integration/Storage/Adapter/Stream/GetSetCest.php
+++ b/tests/integration/Storage/Adapter/Stream/GetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Stream;
 
 use Phalcon\Storage\Adapter\Stream;
 use Phalcon\Storage\Exception;
diff --git a/tests/integration/Storage/Adapter/Stream/IncrementCest.php b/tests/integration/Storage/Adapter/Stream/IncrementCest.php
index a53b932184c..53bc9cf2da4 100644
--- a/tests/integration/Storage/Adapter/Stream/IncrementCest.php
+++ b/tests/integration/Storage/Adapter/Stream/IncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Adapter\Stream;
+namespace Phalcon\Tests\Integration\Storage\Adapter\Stream;
 
 use Phalcon\Storage\Adapter\Stream;
 use Phalcon\Storage\Exception;
diff --git a/tests/integration/Storage/AdapterFactory/NewInstanceCest.php b/tests/integration/Storage/AdapterFactory/NewInstanceCest.php
index ab731912f39..2c73437df14 100644
--- a/tests/integration/Storage/AdapterFactory/NewInstanceCest.php
+++ b/tests/integration/Storage/AdapterFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\AdapterFactory;
+namespace Phalcon\Tests\Integration\Storage\AdapterFactory;
 
 use Codeception\Example;
 use Phalcon\Storage\Exception;
diff --git a/tests/integration/Storage/Serializer/Base64/GetDataCest.php b/tests/integration/Storage/Serializer/Base64/GetDataCest.php
index 104fe4e12dd..ec0d9af93d3 100644
--- a/tests/integration/Storage/Serializer/Base64/GetDataCest.php
+++ b/tests/integration/Storage/Serializer/Base64/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Base64;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Base64;
 
 use Phalcon\Storage\Serializer\Base64;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Base64/SerializeCest.php b/tests/integration/Storage/Serializer/Base64/SerializeCest.php
index 9d41be02eb3..611b0cbd9bb 100644
--- a/tests/integration/Storage/Serializer/Base64/SerializeCest.php
+++ b/tests/integration/Storage/Serializer/Base64/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Base64;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Base64;
 
 use InvalidArgumentException;
 use Phalcon\Storage\Serializer\Base64;
diff --git a/tests/integration/Storage/Serializer/Base64/SetDataCest.php b/tests/integration/Storage/Serializer/Base64/SetDataCest.php
index 0e20edaa051..ead22857899 100644
--- a/tests/integration/Storage/Serializer/Base64/SetDataCest.php
+++ b/tests/integration/Storage/Serializer/Base64/SetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Base64;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Base64;
 
 use Phalcon\Storage\Serializer\Base64;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Base64/UnserializeCest.php b/tests/integration/Storage/Serializer/Base64/UnserializeCest.php
index 73afb778d8e..6823ff833b0 100644
--- a/tests/integration/Storage/Serializer/Base64/UnserializeCest.php
+++ b/tests/integration/Storage/Serializer/Base64/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Base64;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Base64;
 
 use InvalidArgumentException;
 use Phalcon\Storage\Serializer\Base64;
diff --git a/tests/integration/Storage/Serializer/Igbinary/GetDataCest.php b/tests/integration/Storage/Serializer/Igbinary/GetDataCest.php
index 63f38a0bcc6..4286322012f 100644
--- a/tests/integration/Storage/Serializer/Igbinary/GetDataCest.php
+++ b/tests/integration/Storage/Serializer/Igbinary/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Igbinary;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Igbinary;
 
 use Phalcon\Storage\Serializer\Igbinary;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Igbinary/SerializeCest.php b/tests/integration/Storage/Serializer/Igbinary/SerializeCest.php
index 4afc6596364..ee935af0c5c 100644
--- a/tests/integration/Storage/Serializer/Igbinary/SerializeCest.php
+++ b/tests/integration/Storage/Serializer/Igbinary/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Igbinary;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Igbinary;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\Igbinary;
diff --git a/tests/integration/Storage/Serializer/Igbinary/SetDataCest.php b/tests/integration/Storage/Serializer/Igbinary/SetDataCest.php
index 7588edd4e62..d7e13b5423f 100644
--- a/tests/integration/Storage/Serializer/Igbinary/SetDataCest.php
+++ b/tests/integration/Storage/Serializer/Igbinary/SetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Igbinary;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Igbinary;
 
 use Phalcon\Storage\Serializer\Igbinary;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Igbinary/UnserializeCest.php b/tests/integration/Storage/Serializer/Igbinary/UnserializeCest.php
index 92251c12479..4318dbe2fc8 100644
--- a/tests/integration/Storage/Serializer/Igbinary/UnserializeCest.php
+++ b/tests/integration/Storage/Serializer/Igbinary/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Igbinary;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Igbinary;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\Igbinary;
diff --git a/tests/integration/Storage/Serializer/Json/GetDataCest.php b/tests/integration/Storage/Serializer/Json/GetDataCest.php
index 9444e0f36f3..65782b50710 100644
--- a/tests/integration/Storage/Serializer/Json/GetDataCest.php
+++ b/tests/integration/Storage/Serializer/Json/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Json;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Json;
 
 use Phalcon\Storage\Serializer\Json;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Json/SerializeCest.php b/tests/integration/Storage/Serializer/Json/SerializeCest.php
index f929c77c8af..5bb1142500b 100644
--- a/tests/integration/Storage/Serializer/Json/SerializeCest.php
+++ b/tests/integration/Storage/Serializer/Json/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Json;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Json;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/integration/Storage/Serializer/Json/SetDataCest.php b/tests/integration/Storage/Serializer/Json/SetDataCest.php
index 744ed7e080d..ce58c143a67 100644
--- a/tests/integration/Storage/Serializer/Json/SetDataCest.php
+++ b/tests/integration/Storage/Serializer/Json/SetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Json;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Json;
 
 use Phalcon\Storage\Serializer\Json;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Json/UnserializeCest.php b/tests/integration/Storage/Serializer/Json/UnserializeCest.php
index af952c8a093..c13e644c259 100644
--- a/tests/integration/Storage/Serializer/Json/UnserializeCest.php
+++ b/tests/integration/Storage/Serializer/Json/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Json;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Json;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\Json;
diff --git a/tests/integration/Storage/Serializer/Msgpack/GetDataCest.php b/tests/integration/Storage/Serializer/Msgpack/GetDataCest.php
index 73f6c010a3e..cb6203de223 100644
--- a/tests/integration/Storage/Serializer/Msgpack/GetDataCest.php
+++ b/tests/integration/Storage/Serializer/Msgpack/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Msgpack;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Msgpack;
 
 use Phalcon\Storage\Serializer\Msgpack;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Msgpack/SerializeCest.php b/tests/integration/Storage/Serializer/Msgpack/SerializeCest.php
index f92272f57ba..d9c4f54a8c9 100644
--- a/tests/integration/Storage/Serializer/Msgpack/SerializeCest.php
+++ b/tests/integration/Storage/Serializer/Msgpack/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Msgpack;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Msgpack;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\Msgpack;
diff --git a/tests/integration/Storage/Serializer/Msgpack/SetDataCest.php b/tests/integration/Storage/Serializer/Msgpack/SetDataCest.php
index f8116487896..18daa933ed3 100644
--- a/tests/integration/Storage/Serializer/Msgpack/SetDataCest.php
+++ b/tests/integration/Storage/Serializer/Msgpack/SetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Msgpack;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Msgpack;
 
 use Phalcon\Storage\Serializer\Msgpack;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Msgpack/UnserializeCest.php b/tests/integration/Storage/Serializer/Msgpack/UnserializeCest.php
index e1833444165..016a56a854b 100644
--- a/tests/integration/Storage/Serializer/Msgpack/UnserializeCest.php
+++ b/tests/integration/Storage/Serializer/Msgpack/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Msgpack;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Msgpack;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\Msgpack;
diff --git a/tests/integration/Storage/Serializer/None/GetDataCest.php b/tests/integration/Storage/Serializer/None/GetDataCest.php
index a48456efd72..d59147be408 100644
--- a/tests/integration/Storage/Serializer/None/GetDataCest.php
+++ b/tests/integration/Storage/Serializer/None/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\None;
+namespace Phalcon\Tests\Integration\Storage\Serializer\None;
 
 use Phalcon\Storage\Serializer\None;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/None/SerializeCest.php b/tests/integration/Storage/Serializer/None/SerializeCest.php
index eb5546e5874..1c440c5e6a2 100644
--- a/tests/integration/Storage/Serializer/None/SerializeCest.php
+++ b/tests/integration/Storage/Serializer/None/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\None;
+namespace Phalcon\Tests\Integration\Storage\Serializer\None;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\None;
diff --git a/tests/integration/Storage/Serializer/None/SetDataCest.php b/tests/integration/Storage/Serializer/None/SetDataCest.php
index 7a95c6b510b..9c59c00278f 100644
--- a/tests/integration/Storage/Serializer/None/SetDataCest.php
+++ b/tests/integration/Storage/Serializer/None/SetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\None;
+namespace Phalcon\Tests\Integration\Storage\Serializer\None;
 
 use Phalcon\Storage\Serializer\None;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/None/UnserializeCest.php b/tests/integration/Storage/Serializer/None/UnserializeCest.php
index fa0fb412b3c..06e900c3f13 100644
--- a/tests/integration/Storage/Serializer/None/UnserializeCest.php
+++ b/tests/integration/Storage/Serializer/None/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\None;
+namespace Phalcon\Tests\Integration\Storage\Serializer\None;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\None;
diff --git a/tests/integration/Storage/Serializer/Php/GetDataCest.php b/tests/integration/Storage/Serializer/Php/GetDataCest.php
index 099dd422c39..4a781f203b7 100644
--- a/tests/integration/Storage/Serializer/Php/GetDataCest.php
+++ b/tests/integration/Storage/Serializer/Php/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Php;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Php;
 
 use Phalcon\Storage\Serializer\Php;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Php/SerializeCest.php b/tests/integration/Storage/Serializer/Php/SerializeCest.php
index 49a4352a85d..74ec24d4db2 100644
--- a/tests/integration/Storage/Serializer/Php/SerializeCest.php
+++ b/tests/integration/Storage/Serializer/Php/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Php;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Php;
 
 use Codeception\Example;
 use Phalcon\Storage\Serializer\Php;
diff --git a/tests/integration/Storage/Serializer/Php/SetDataCest.php b/tests/integration/Storage/Serializer/Php/SetDataCest.php
index 355bf932ffa..e29e3f35784 100644
--- a/tests/integration/Storage/Serializer/Php/SetDataCest.php
+++ b/tests/integration/Storage/Serializer/Php/SetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Php;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Php;
 
 use Phalcon\Storage\Serializer\Php;
 use IntegrationTester;
diff --git a/tests/integration/Storage/Serializer/Php/UnserializeCest.php b/tests/integration/Storage/Serializer/Php/UnserializeCest.php
index d5ddc34094f..f322a806f3b 100644
--- a/tests/integration/Storage/Serializer/Php/UnserializeCest.php
+++ b/tests/integration/Storage/Serializer/Php/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\Serializer\Php;
+namespace Phalcon\Tests\Integration\Storage\Serializer\Php;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/integration/Storage/SerializerFactory/NewInstanceCest.php b/tests/integration/Storage/SerializerFactory/NewInstanceCest.php
index 279987194f4..1e864615c68 100644
--- a/tests/integration/Storage/SerializerFactory/NewInstanceCest.php
+++ b/tests/integration/Storage/SerializerFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Storage\SerializerFactory;
+namespace Phalcon\Tests\Integration\Storage\SerializerFactory;
 
 use Codeception\Example;
 use Phalcon\Storage\Exception;
diff --git a/tests/integration/Url/GetCest.php b/tests/integration/Url/GetCest.php
index e5b8b7feee5..db5a01fdb07 100644
--- a/tests/integration/Url/GetCest.php
+++ b/tests/integration/Url/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Url;
diff --git a/tests/integration/Url/GetSetBasePathCest.php b/tests/integration/Url/GetSetBasePathCest.php
index ec7910d11ba..f6a6cebc9e1 100644
--- a/tests/integration/Url/GetSetBasePathCest.php
+++ b/tests/integration/Url/GetSetBasePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Url;
diff --git a/tests/integration/Url/GetSetBaseUriCest.php b/tests/integration/Url/GetSetBaseUriCest.php
index f1c2cf6ed24..1b31f26d8b0 100644
--- a/tests/integration/Url/GetSetBaseUriCest.php
+++ b/tests/integration/Url/GetSetBaseUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Url;
diff --git a/tests/integration/Url/GetSetDICest.php b/tests/integration/Url/GetSetDICest.php
index 7ef6c69dd02..0a5f96803b9 100644
--- a/tests/integration/Url/GetSetDICest.php
+++ b/tests/integration/Url/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Di;
diff --git a/tests/integration/Url/GetSetStaticBaseUriCest.php b/tests/integration/Url/GetSetStaticBaseUriCest.php
index e6775efec91..467c3e70bee 100644
--- a/tests/integration/Url/GetSetStaticBaseUriCest.php
+++ b/tests/integration/Url/GetSetStaticBaseUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Url;
diff --git a/tests/integration/Url/GetStaticBaseUriCest.php b/tests/integration/Url/GetStaticBaseUriCest.php
index 1dbf5a3fe2f..e7f8d689c4f 100644
--- a/tests/integration/Url/GetStaticBaseUriCest.php
+++ b/tests/integration/Url/GetStaticBaseUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Url/GetStaticCest.php b/tests/integration/Url/GetStaticCest.php
index d6ea09743f3..7f0a3228f85 100644
--- a/tests/integration/Url/GetStaticCest.php
+++ b/tests/integration/Url/GetStaticCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Url;
diff --git a/tests/integration/Url/PathCest.php b/tests/integration/Url/PathCest.php
index e31fce3b966..bce00bc163e 100644
--- a/tests/integration/Url/PathCest.php
+++ b/tests/integration/Url/PathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Url;
diff --git a/tests/integration/Url/Refactor-UrlCest.php b/tests/integration/Url/Refactor-UrlCest.php
index cf78ef0d74b..e64b1d4ca21 100644
--- a/tests/integration/Url/Refactor-UrlCest.php
+++ b/tests/integration/Url/Refactor-UrlCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Url;
+namespace Phalcon\Tests\Url;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Router;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class UrlCest
 {
diff --git a/tests/integration/Url/SetBasePathCest.php b/tests/integration/Url/SetBasePathCest.php
index f79b262f911..88d805d0093 100644
--- a/tests/integration/Url/SetBasePathCest.php
+++ b/tests/integration/Url/SetBasePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Url/SetBaseUriCest.php b/tests/integration/Url/SetBaseUriCest.php
index 2f0f59d57b2..5d13d57badc 100644
--- a/tests/integration/Url/SetBaseUriCest.php
+++ b/tests/integration/Url/SetBaseUriCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Router;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 /**
  * Class SetBaseUriCest
diff --git a/tests/integration/Url/SetStaticBaseUriCest.php b/tests/integration/Url/SetStaticBaseUriCest.php
index 7090a346d8c..f14a1fb9c15 100644
--- a/tests/integration/Url/SetStaticBaseUriCest.php
+++ b/tests/integration/Url/SetStaticBaseUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Url;
+namespace Phalcon\Tests\Integration\Url;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/AddCest.php b/tests/integration/Validation/AddCest.php
index d41344397ef..9d0f15c6151 100644
--- a/tests/integration/Validation/AddCest.php
+++ b/tests/integration/Validation/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/AppendMessageCest.php b/tests/integration/Validation/AppendMessageCest.php
index 660f21afe44..c5fabc009ab 100644
--- a/tests/integration/Validation/AppendMessageCest.php
+++ b/tests/integration/Validation/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/BindCest.php b/tests/integration/Validation/BindCest.php
index f8c2f365b77..811c51565b0 100644
--- a/tests/integration/Validation/BindCest.php
+++ b/tests/integration/Validation/BindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/ConstructCest.php b/tests/integration/Validation/ConstructCest.php
index 82b75992863..fc5ce395871 100644
--- a/tests/integration/Validation/ConstructCest.php
+++ b/tests/integration/Validation/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/GetDataCest.php b/tests/integration/Validation/GetDataCest.php
index 8736f1282c6..3066cc18e14 100644
--- a/tests/integration/Validation/GetDataCest.php
+++ b/tests/integration/Validation/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/GetEntityCest.php b/tests/integration/Validation/GetEntityCest.php
index db5e3573f27..8f7fe890c18 100644
--- a/tests/integration/Validation/GetEntityCest.php
+++ b/tests/integration/Validation/GetEntityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/GetEventsManagerCest.php b/tests/integration/Validation/GetEventsManagerCest.php
index 8fcc9ed8b9f..3236dce9650 100644
--- a/tests/integration/Validation/GetEventsManagerCest.php
+++ b/tests/integration/Validation/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetFiltersCest.php b/tests/integration/Validation/GetFiltersCest.php
index 51952f247f0..1a4d12b1e55 100644
--- a/tests/integration/Validation/GetFiltersCest.php
+++ b/tests/integration/Validation/GetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/GetLabelCest.php b/tests/integration/Validation/GetLabelCest.php
index 01437eeb0f9..c5149a872c4 100644
--- a/tests/integration/Validation/GetLabelCest.php
+++ b/tests/integration/Validation/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetMessagesCest.php b/tests/integration/Validation/GetMessagesCest.php
index bb553d8f609..64c1442cb7e 100644
--- a/tests/integration/Validation/GetMessagesCest.php
+++ b/tests/integration/Validation/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetSetDICest.php b/tests/integration/Validation/GetSetDICest.php
index e7e4f275eb4..2394d0c2acd 100644
--- a/tests/integration/Validation/GetSetDICest.php
+++ b/tests/integration/Validation/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetValidatorsCest.php b/tests/integration/Validation/GetValidatorsCest.php
index a0b1e31e3b3..a267a74b89f 100644
--- a/tests/integration/Validation/GetValidatorsCest.php
+++ b/tests/integration/Validation/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetValueCest.php b/tests/integration/Validation/GetValueCest.php
index 4cf7180206f..ebc121bdbd2 100644
--- a/tests/integration/Validation/GetValueCest.php
+++ b/tests/integration/Validation/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/RuleCest.php b/tests/integration/Validation/RuleCest.php
index 84e0c46400a..2e3777bfc05 100644
--- a/tests/integration/Validation/RuleCest.php
+++ b/tests/integration/Validation/RuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/RulesCest.php b/tests/integration/Validation/RulesCest.php
index c9e12aaab2a..a3e5159534e 100644
--- a/tests/integration/Validation/RulesCest.php
+++ b/tests/integration/Validation/RulesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/SetDefaultMessagesCest.php b/tests/integration/Validation/SetDefaultMessagesCest.php
index 8c2c2e54821..1132ad0320c 100644
--- a/tests/integration/Validation/SetDefaultMessagesCest.php
+++ b/tests/integration/Validation/SetDefaultMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/SetEntityCest.php b/tests/integration/Validation/SetEntityCest.php
index 0c9c489bc35..f2b96e6bbe3 100644
--- a/tests/integration/Validation/SetEntityCest.php
+++ b/tests/integration/Validation/SetEntityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/SetEventsManagerCest.php b/tests/integration/Validation/SetEventsManagerCest.php
index 9eba6854525..caec8351e50 100644
--- a/tests/integration/Validation/SetEventsManagerCest.php
+++ b/tests/integration/Validation/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/SetFiltersCest.php b/tests/integration/Validation/SetFiltersCest.php
index 1c76d82ade6..ded65bf7378 100644
--- a/tests/integration/Validation/SetFiltersCest.php
+++ b/tests/integration/Validation/SetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/SetLabelsCest.php b/tests/integration/Validation/SetLabelsCest.php
index 8629c4258fc..49db4968aaf 100644
--- a/tests/integration/Validation/SetLabelsCest.php
+++ b/tests/integration/Validation/SetLabelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/SetValidatorsCest.php b/tests/integration/Validation/SetValidatorsCest.php
index 27850750059..508dba38d40 100644
--- a/tests/integration/Validation/SetValidatorsCest.php
+++ b/tests/integration/Validation/SetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/UnderscoreGetCest.php b/tests/integration/Validation/UnderscoreGetCest.php
index 8a4a8e712ed..0ba4dee576a 100644
--- a/tests/integration/Validation/UnderscoreGetCest.php
+++ b/tests/integration/Validation/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/ValidateCest.php b/tests/integration/Validation/ValidateCest.php
index 1254d06085f..6c50457dfaf 100644
--- a/tests/integration/Validation/ValidateCest.php
+++ b/tests/integration/Validation/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/Alnum/ConstructCest.php b/tests/integration/Validation/Validator/Alnum/ConstructCest.php
index 274bb1986ba..4f5a40b2ffd 100644
--- a/tests/integration/Validation/Validator/Alnum/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Alnum/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alnum;
 
 class ConstructCest
diff --git a/tests/integration/Validation/Validator/Alnum/GetOptionCest.php b/tests/integration/Validation/Validator/Alnum/GetOptionCest.php
index 8bf397906d3..00108a2a935 100644
--- a/tests/integration/Validation/Validator/Alnum/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Alnum/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alnum;
 
 /**
diff --git a/tests/integration/Validation/Validator/Alnum/HasOptionCest.php b/tests/integration/Validation/Validator/Alnum/HasOptionCest.php
index a562cd145ea..3604583632a 100644
--- a/tests/integration/Validation/Validator/Alnum/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Alnum/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alnum;
 
 class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Alnum/SetOptionCest.php b/tests/integration/Validation/Validator/Alnum/SetOptionCest.php
index 02311bd9335..4acfce34344 100644
--- a/tests/integration/Validation/Validator/Alnum/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Alnum/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alnum;
 
 class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Alnum/ValidateCest.php b/tests/integration/Validation/Validator/Alnum/ValidateCest.php
index 70641596fc5..fefc338474f 100644
--- a/tests/integration/Validation/Validator/Alnum/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Alnum/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/Validator/Alpha/ConstructCest.php b/tests/integration/Validation/Validator/Alpha/ConstructCest.php
index 5a7906f9aa7..2ee22d4ada8 100644
--- a/tests/integration/Validation/Validator/Alpha/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Alpha/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alpha;
 
 /**
diff --git a/tests/integration/Validation/Validator/Alpha/GetOptionCest.php b/tests/integration/Validation/Validator/Alpha/GetOptionCest.php
index e5a5b562104..4ae96ea7bfc 100644
--- a/tests/integration/Validation/Validator/Alpha/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Alpha/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alpha;
 
 /**
diff --git a/tests/integration/Validation/Validator/Alpha/HasOptionCest.php b/tests/integration/Validation/Validator/Alpha/HasOptionCest.php
index 844d0a7b892..417cccb2f1d 100644
--- a/tests/integration/Validation/Validator/Alpha/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Alpha/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alpha;
 
 /**
diff --git a/tests/integration/Validation/Validator/Alpha/SetOptionCest.php b/tests/integration/Validation/Validator/Alpha/SetOptionCest.php
index 06aa17d6073..0d1db1c189d 100644
--- a/tests/integration/Validation/Validator/Alpha/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Alpha/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Alpha;
 
 /**
diff --git a/tests/integration/Validation/Validator/Alpha/ValidateCest.php b/tests/integration/Validation/Validator/Alpha/ValidateCest.php
index 1bec2c3983d..86561a23237 100644
--- a/tests/integration/Validation/Validator/Alpha/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Alpha/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/Between/ConstructCest.php b/tests/integration/Validation/Validator/Between/ConstructCest.php
index 7325021f5ed..1cbf2051584 100644
--- a/tests/integration/Validation/Validator/Between/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Between/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Between;
 
 /**
diff --git a/tests/integration/Validation/Validator/Between/GetOptionCest.php b/tests/integration/Validation/Validator/Between/GetOptionCest.php
index 37ddfdd097e..250a37c9c55 100644
--- a/tests/integration/Validation/Validator/Between/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Between/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Between;
 
 /**
diff --git a/tests/integration/Validation/Validator/Between/HasOptionCest.php b/tests/integration/Validation/Validator/Between/HasOptionCest.php
index 56d8ae65bd3..377e8f69027 100644
--- a/tests/integration/Validation/Validator/Between/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Between/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Between;
 
 class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Between/SetOptionCest.php b/tests/integration/Validation/Validator/Between/SetOptionCest.php
index e1e4d7114a2..d6009e0bc7f 100644
--- a/tests/integration/Validation/Validator/Between/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Between/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Between;
 
 /**
diff --git a/tests/integration/Validation/Validator/Between/ValidateCest.php b/tests/integration/Validation/Validator/Between/ValidateCest.php
index a08c0ad78aa..b6900db5de7 100644
--- a/tests/integration/Validation/Validator/Between/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Between/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Validation\Validator\Between;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/Callback/ConstructCest.php b/tests/integration/Validation/Validator/Callback/ConstructCest.php
index 8e14442fc63..d8a0b1b6492 100644
--- a/tests/integration/Validation/Validator/Callback/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Callback/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Callback;
 
 /**
diff --git a/tests/integration/Validation/Validator/Callback/GetOptionCest.php b/tests/integration/Validation/Validator/Callback/GetOptionCest.php
index d9901a075e1..5f4c5ceb198 100644
--- a/tests/integration/Validation/Validator/Callback/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Callback/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Callback;
 
 /**
diff --git a/tests/integration/Validation/Validator/Callback/HasOptionCest.php b/tests/integration/Validation/Validator/Callback/HasOptionCest.php
index bce97136f62..853469257d8 100644
--- a/tests/integration/Validation/Validator/Callback/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Callback/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Callback;
 
 class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Callback/SetOptionCest.php b/tests/integration/Validation/Validator/Callback/SetOptionCest.php
index 5487959feac..95bc8458a59 100644
--- a/tests/integration/Validation/Validator/Callback/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Callback/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Callback;
 
 /**
diff --git a/tests/integration/Validation/Validator/Callback/ValidateCest.php b/tests/integration/Validation/Validator/Callback/ValidateCest.php
index 1d358be58bb..5189ddfb572 100644
--- a/tests/integration/Validation/Validator/Callback/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Callback/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/Confirmation/ConstructCest.php b/tests/integration/Validation/Validator/Confirmation/ConstructCest.php
index e0c77192248..71b7409b669 100644
--- a/tests/integration/Validation/Validator/Confirmation/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Confirmation/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Confirmation;
 
 /**
diff --git a/tests/integration/Validation/Validator/Confirmation/GetOptionCest.php b/tests/integration/Validation/Validator/Confirmation/GetOptionCest.php
index a4e79fe36b6..f143a8a3091 100644
--- a/tests/integration/Validation/Validator/Confirmation/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Confirmation/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Confirmation;
 
 /**
diff --git a/tests/integration/Validation/Validator/Confirmation/HasOptionCest.php b/tests/integration/Validation/Validator/Confirmation/HasOptionCest.php
index 5f39d48ea63..2fd707ab0c6 100644
--- a/tests/integration/Validation/Validator/Confirmation/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Confirmation/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Confirmation;
 
 class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Confirmation/SetOptionCest.php b/tests/integration/Validation/Validator/Confirmation/SetOptionCest.php
index ae4a8134976..f9c72305f7a 100644
--- a/tests/integration/Validation/Validator/Confirmation/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Confirmation/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Confirmation;
 
 /**
diff --git a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php b/tests/integration/Validation/Validator/Confirmation/ValidateCest.php
index f44f7c04824..221223d92b6 100644
--- a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Confirmation/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/ConstructCest.php b/tests/integration/Validation/Validator/ConstructCest.php
index 97bd5b57e3c..bdb619d7e6c 100644
--- a/tests/integration/Validation/Validator/ConstructCest.php
+++ b/tests/integration/Validation/Validator/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\PresenceOf;
diff --git a/tests/integration/Validation/Validator/CreditCard/ConstructCest.php b/tests/integration/Validation/Validator/CreditCard/ConstructCest.php
index 83173cfe88d..054cc3581d4 100644
--- a/tests/integration/Validation/Validator/CreditCard/ConstructCest.php
+++ b/tests/integration/Validation/Validator/CreditCard/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\CreditCard;
 
 /**
diff --git a/tests/integration/Validation/Validator/CreditCard/GetOptionCest.php b/tests/integration/Validation/Validator/CreditCard/GetOptionCest.php
index b71b8d2ac9d..62ad03fecd1 100644
--- a/tests/integration/Validation/Validator/CreditCard/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/CreditCard/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\CreditCard;
 
 /**
diff --git a/tests/integration/Validation/Validator/CreditCard/HasOptionCest.php b/tests/integration/Validation/Validator/CreditCard/HasOptionCest.php
index 31d94504314..a59e50ea9f1 100644
--- a/tests/integration/Validation/Validator/CreditCard/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/CreditCard/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\CreditCard;
 
 /**
diff --git a/tests/integration/Validation/Validator/CreditCard/SetOptionCest.php b/tests/integration/Validation/Validator/CreditCard/SetOptionCest.php
index f994484d7ca..6efbaaa97fb 100644
--- a/tests/integration/Validation/Validator/CreditCard/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/CreditCard/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\CreditCard;
 
 /**
diff --git a/tests/integration/Validation/Validator/CreditCard/ValidateCest.php b/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
index 369b1d5871b..781b205005c 100644
--- a/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
+++ b/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/Date/ConstructCest.php b/tests/integration/Validation/Validator/Date/ConstructCest.php
index 81afe13752e..abc39485724 100644
--- a/tests/integration/Validation/Validator/Date/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Date/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Date;
 
 /**
diff --git a/tests/integration/Validation/Validator/Date/GetOptionCest.php b/tests/integration/Validation/Validator/Date/GetOptionCest.php
index 8782890db2c..9264fba5634 100644
--- a/tests/integration/Validation/Validator/Date/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Date/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Date;
 
 /**
diff --git a/tests/integration/Validation/Validator/Date/HasOptionCest.php b/tests/integration/Validation/Validator/Date/HasOptionCest.php
index d59e2cd5480..accbe772c07 100644
--- a/tests/integration/Validation/Validator/Date/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Date/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Date;
 
 /**
diff --git a/tests/integration/Validation/Validator/Date/SetOptionCest.php b/tests/integration/Validation/Validator/Date/SetOptionCest.php
index 3bfdff2c04f..28e3c28ca64 100644
--- a/tests/integration/Validation/Validator/Date/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Date/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Date;
 
 /**
diff --git a/tests/integration/Validation/Validator/Date/ValidateCest.php b/tests/integration/Validation/Validator/Date/ValidateCest.php
index 39cfab187cc..7ae6103e51a 100644
--- a/tests/integration/Validation/Validator/Date/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Date/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Validation\Validator\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/DateCest.php b/tests/integration/Validation/Validator/DateCest.php
index 3cbf3845d86..3e7dfa5d734 100644
--- a/tests/integration/Validation/Validator/DateCest.php
+++ b/tests/integration/Validation/Validator/DateCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/Digit/ConstructCest.php b/tests/integration/Validation/Validator/Digit/ConstructCest.php
index 17f0bf1a8b6..ba8f5d64ad7 100644
--- a/tests/integration/Validation/Validator/Digit/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Digit/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Digit;
 
 /**
diff --git a/tests/integration/Validation/Validator/Digit/GetOptionCest.php b/tests/integration/Validation/Validator/Digit/GetOptionCest.php
index f0e290df8b0..e7f290df3c2 100644
--- a/tests/integration/Validation/Validator/Digit/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Digit/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Digit;
 
 /**
diff --git a/tests/integration/Validation/Validator/Digit/HasOptionCest.php b/tests/integration/Validation/Validator/Digit/HasOptionCest.php
index f83e5e01665..df6103a6934 100644
--- a/tests/integration/Validation/Validator/Digit/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Digit/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Digit;
 
 /**
diff --git a/tests/integration/Validation/Validator/Digit/SetOptionCest.php b/tests/integration/Validation/Validator/Digit/SetOptionCest.php
index 51c5e4ffb68..720b6bdf0a8 100644
--- a/tests/integration/Validation/Validator/Digit/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Digit/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Digit;
 
 /**
diff --git a/tests/integration/Validation/Validator/Digit/ValidateCest.php b/tests/integration/Validation/Validator/Digit/ValidateCest.php
index fdc5b6eb073..6c9c46e7158 100644
--- a/tests/integration/Validation/Validator/Digit/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Digit/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/DigitCest.php b/tests/integration/Validation/Validator/DigitCest.php
index 0cee32f4feb..3025499b103 100644
--- a/tests/integration/Validation/Validator/DigitCest.php
+++ b/tests/integration/Validation/Validator/DigitCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/Email/ConstructCest.php b/tests/integration/Validation/Validator/Email/ConstructCest.php
index daa91550086..a7eb34d5c49 100644
--- a/tests/integration/Validation/Validator/Email/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Email/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Email;
 
 /**
diff --git a/tests/integration/Validation/Validator/Email/GetOptionCest.php b/tests/integration/Validation/Validator/Email/GetOptionCest.php
index 63cf1ca04e7..b4f15e26bc4 100644
--- a/tests/integration/Validation/Validator/Email/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Email/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Email;
 
 /**
diff --git a/tests/integration/Validation/Validator/Email/HasOptionCest.php b/tests/integration/Validation/Validator/Email/HasOptionCest.php
index 2a549d91228..1f404f3393f 100644
--- a/tests/integration/Validation/Validator/Email/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Email/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Email;
 
 /**
diff --git a/tests/integration/Validation/Validator/Email/SetOptionCest.php b/tests/integration/Validation/Validator/Email/SetOptionCest.php
index eb2f86562b6..5a81253cd91 100644
--- a/tests/integration/Validation/Validator/Email/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Email/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Email;
 
 /**
diff --git a/tests/integration/Validation/Validator/Email/ValidateCest.php b/tests/integration/Validation/Validator/Email/ValidateCest.php
index f22e22a3d22..0a4b1dd5e91 100644
--- a/tests/integration/Validation/Validator/Email/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Email/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Validation\Validator\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/EmailCest.php b/tests/integration/Validation/Validator/EmailCest.php
index 5da0f558e65..c478d88b82c 100644
--- a/tests/integration/Validation/Validator/EmailCest.php
+++ b/tests/integration/Validation/Validator/EmailCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php b/tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php
index 46985ee918a..3a2f85718ae 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php
+++ b/tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\ExclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php b/tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php
index 54c60737211..f8f62c5813f 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\ExclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php b/tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php
index ffdd39f0765..73a5d7193de 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\ExclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php b/tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php
index 49c9aecc8d6..c8163081926 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\ExclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php b/tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php
index 1fa20f911d8..dfda77d9be7 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php
+++ b/tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/ExclusionInCest.php b/tests/integration/Validation/Validator/ExclusionInCest.php
index 7237b244c49..f9d973ca25f 100644
--- a/tests/integration/Validation/Validator/ExclusionInCest.php
+++ b/tests/integration/Validation/Validator/ExclusionInCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/File/ConstructCest.php b/tests/integration/Validation/Validator/File/ConstructCest.php
index 1c06e09ea22..a2e154c5cd1 100644
--- a/tests/integration/Validation/Validator/File/ConstructCest.php
+++ b/tests/integration/Validation/Validator/File/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\File;
 
 /**
diff --git a/tests/integration/Validation/Validator/File/GetOptionCest.php b/tests/integration/Validation/Validator/File/GetOptionCest.php
index 1d297ec6dbc..49778fe7e9d 100644
--- a/tests/integration/Validation/Validator/File/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/File/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\File;
 
 /**
diff --git a/tests/integration/Validation/Validator/File/HasOptionCest.php b/tests/integration/Validation/Validator/File/HasOptionCest.php
index 85b430771e7..82cae360ba3 100644
--- a/tests/integration/Validation/Validator/File/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/File/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\File;
 
 /**
diff --git a/tests/integration/Validation/Validator/File/IsAllowEmptyCest.php b/tests/integration/Validation/Validator/File/IsAllowEmptyCest.php
index 1ddf1dfc705..8b807504fc5 100644
--- a/tests/integration/Validation/Validator/File/IsAllowEmptyCest.php
+++ b/tests/integration/Validation/Validator/File/IsAllowEmptyCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Validation\Validator\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/File/SetOptionCest.php b/tests/integration/Validation/Validator/File/SetOptionCest.php
index f1420af9d23..f2df18d5270 100644
--- a/tests/integration/Validation/Validator/File/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/File/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\File;
 
 /**
diff --git a/tests/integration/Validation/Validator/File/ValidateCest.php b/tests/integration/Validation/Validator/File/ValidateCest.php
index 494b160245b..1ec419dea44 100644
--- a/tests/integration/Validation/Validator/File/ValidateCest.php
+++ b/tests/integration/Validation/Validator/File/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Validation\Validator\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/GetOptionCest.php b/tests/integration/Validation/Validator/GetOptionCest.php
index 7a00f1017a0..b57bad6e6d4 100644
--- a/tests/integration/Validation/Validator/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/HasOptionCest.php b/tests/integration/Validation/Validator/HasOptionCest.php
index 95955b35fe9..745b82c01ad 100644
--- a/tests/integration/Validation/Validator/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/Identical/ConstructCest.php b/tests/integration/Validation/Validator/Identical/ConstructCest.php
index 7b788875573..5b83a710128 100644
--- a/tests/integration/Validation/Validator/Identical/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Identical/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Identical;
 
 /**
diff --git a/tests/integration/Validation/Validator/Identical/GetOptionCest.php b/tests/integration/Validation/Validator/Identical/GetOptionCest.php
index 276ccfe97c2..f6b5e4242d9 100644
--- a/tests/integration/Validation/Validator/Identical/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Identical/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Identical;
 
 /**
diff --git a/tests/integration/Validation/Validator/Identical/HasOptionCest.php b/tests/integration/Validation/Validator/Identical/HasOptionCest.php
index b5a21887110..55bd41ff2e9 100644
--- a/tests/integration/Validation/Validator/Identical/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Identical/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Identical;
 
 /**
diff --git a/tests/integration/Validation/Validator/Identical/SetOptionCest.php b/tests/integration/Validation/Validator/Identical/SetOptionCest.php
index 19b08b0d437..4ede18e211d 100644
--- a/tests/integration/Validation/Validator/Identical/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Identical/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Identical;
 
 /**
diff --git a/tests/integration/Validation/Validator/Identical/ValidateCest.php b/tests/integration/Validation/Validator/Identical/ValidateCest.php
index 650c355d7f8..7b02f9d235a 100644
--- a/tests/integration/Validation/Validator/Identical/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Identical/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/IdenticalCest.php b/tests/integration/Validation/Validator/IdenticalCest.php
index 8be57967173..ad909470b08 100644
--- a/tests/integration/Validation/Validator/IdenticalCest.php
+++ b/tests/integration/Validation/Validator/IdenticalCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/InclusionIn/ConstructCest.php b/tests/integration/Validation/Validator/InclusionIn/ConstructCest.php
index 91258dcb2b3..fccd304957e 100644
--- a/tests/integration/Validation/Validator/InclusionIn/ConstructCest.php
+++ b/tests/integration/Validation/Validator/InclusionIn/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\InclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php b/tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php
index 658ce2ca845..9a1c23892a1 100644
--- a/tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\InclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php b/tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php
index 0cedaea1277..d74fab203ae 100644
--- a/tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\InclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php b/tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php
index 03abeb3039a..9fcad21cde5 100644
--- a/tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\InclusionIn;
 
 /**
diff --git a/tests/integration/Validation/Validator/InclusionIn/ValidateCest.php b/tests/integration/Validation/Validator/InclusionIn/ValidateCest.php
index c1c333ff9d3..d74fb79da87 100644
--- a/tests/integration/Validation/Validator/InclusionIn/ValidateCest.php
+++ b/tests/integration/Validation/Validator/InclusionIn/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/InclusionInCest.php b/tests/integration/Validation/Validator/InclusionInCest.php
index 71105c03866..ef1692aeb6e 100644
--- a/tests/integration/Validation/Validator/InclusionInCest.php
+++ b/tests/integration/Validation/Validator/InclusionInCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/Ip/ConstructCest.php b/tests/integration/Validation/Validator/Ip/ConstructCest.php
index 28466d40901..a5e91f7bba3 100644
--- a/tests/integration/Validation/Validator/Ip/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Ip/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Ip;
 
 /**
diff --git a/tests/integration/Validation/Validator/Ip/GetOptionCest.php b/tests/integration/Validation/Validator/Ip/GetOptionCest.php
index 9b45f069a2b..58fa383d7e7 100644
--- a/tests/integration/Validation/Validator/Ip/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Ip/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Ip;
 
 /**
diff --git a/tests/integration/Validation/Validator/Ip/HasOptionCest.php b/tests/integration/Validation/Validator/Ip/HasOptionCest.php
index 2581954053b..e1983a0652b 100644
--- a/tests/integration/Validation/Validator/Ip/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Ip/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Ip;
 
 /**
diff --git a/tests/integration/Validation/Validator/Ip/SetOptionCest.php b/tests/integration/Validation/Validator/Ip/SetOptionCest.php
index 1414f25fa6b..c4bf8108bf5 100644
--- a/tests/integration/Validation/Validator/Ip/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Ip/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Ip;
 
 /**
diff --git a/tests/integration/Validation/Validator/Ip/ValidateCest.php b/tests/integration/Validation/Validator/Ip/ValidateCest.php
index b9d9bc2d111..f43f669736b 100644
--- a/tests/integration/Validation/Validator/Ip/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Ip/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/Validator/Numericality/ConstructCest.php b/tests/integration/Validation/Validator/Numericality/ConstructCest.php
index 8977dcd2581..48faa43d199 100644
--- a/tests/integration/Validation/Validator/Numericality/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Numericality/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Numericality;
 
 /**
diff --git a/tests/integration/Validation/Validator/Numericality/GetOptionCest.php b/tests/integration/Validation/Validator/Numericality/GetOptionCest.php
index 28355c256fd..3b66e4f4de1 100644
--- a/tests/integration/Validation/Validator/Numericality/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Numericality/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Numericality;
 
 /**
diff --git a/tests/integration/Validation/Validator/Numericality/HasOptionCest.php b/tests/integration/Validation/Validator/Numericality/HasOptionCest.php
index 8b484e90108..8a3b1c9aeef 100644
--- a/tests/integration/Validation/Validator/Numericality/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Numericality/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Numericality;
 
 /**
diff --git a/tests/integration/Validation/Validator/Numericality/SetOptionCest.php b/tests/integration/Validation/Validator/Numericality/SetOptionCest.php
index 55a487191d2..aaeee4939db 100644
--- a/tests/integration/Validation/Validator/Numericality/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Numericality/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Numericality;
 
 /**
diff --git a/tests/integration/Validation/Validator/Numericality/ValidateCest.php b/tests/integration/Validation/Validator/Numericality/ValidateCest.php
index a349c73be61..2d43af5f451 100644
--- a/tests/integration/Validation/Validator/Numericality/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Numericality/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/NumericalityCest.php b/tests/integration/Validation/Validator/NumericalityCest.php
index b61e3ed310e..a128feed554 100644
--- a/tests/integration/Validation/Validator/NumericalityCest.php
+++ b/tests/integration/Validation/Validator/NumericalityCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/PresenceOf/ConstructCest.php b/tests/integration/Validation/Validator/PresenceOf/ConstructCest.php
index fe76388a99f..195e836d010 100644
--- a/tests/integration/Validation/Validator/PresenceOf/ConstructCest.php
+++ b/tests/integration/Validation/Validator/PresenceOf/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\PresenceOf;
 
 class ConstructCest
diff --git a/tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php b/tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php
index 16c97b7d4fb..98c7dee5215 100644
--- a/tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\PresenceOf;
 
 /**
diff --git a/tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php b/tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php
index 756d4d5a719..fa391a737f8 100644
--- a/tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\PresenceOf;
 
 class HasOptionCest
diff --git a/tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php b/tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php
index e451e6fa624..7d88740875a 100644
--- a/tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\PresenceOf;
 
 /**
diff --git a/tests/integration/Validation/Validator/PresenceOf/ValidateCest.php b/tests/integration/Validation/Validator/PresenceOf/ValidateCest.php
index d8fd04de9c5..11ad5974e5d 100644
--- a/tests/integration/Validation/Validator/PresenceOf/ValidateCest.php
+++ b/tests/integration/Validation/Validator/PresenceOf/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/PresenceOfCest.php b/tests/integration/Validation/Validator/PresenceOfCest.php
index 77953826425..13c33865183 100644
--- a/tests/integration/Validation/Validator/PresenceOfCest.php
+++ b/tests/integration/Validation/Validator/PresenceOfCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/Regex/ConstructCest.php b/tests/integration/Validation/Validator/Regex/ConstructCest.php
index 98d98b99c82..3444161d903 100644
--- a/tests/integration/Validation/Validator/Regex/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Regex/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Regex;
 
 /**
diff --git a/tests/integration/Validation/Validator/Regex/GetOptionCest.php b/tests/integration/Validation/Validator/Regex/GetOptionCest.php
index 499a91a059a..e1a37d5b1a7 100644
--- a/tests/integration/Validation/Validator/Regex/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Regex/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Regex;
 
 /**
diff --git a/tests/integration/Validation/Validator/Regex/HasOptionCest.php b/tests/integration/Validation/Validator/Regex/HasOptionCest.php
index 1ed918c7cfa..7246fd9cde2 100644
--- a/tests/integration/Validation/Validator/Regex/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Regex/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Regex;
 
 /**
diff --git a/tests/integration/Validation/Validator/Regex/SetOptionCest.php b/tests/integration/Validation/Validator/Regex/SetOptionCest.php
index 54e170e3f9f..452441ef617 100644
--- a/tests/integration/Validation/Validator/Regex/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Regex/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Regex;
 
 /**
diff --git a/tests/integration/Validation/Validator/Regex/ValidateCest.php b/tests/integration/Validation/Validator/Regex/ValidateCest.php
index 532769f12e7..d3c1913d97f 100644
--- a/tests/integration/Validation/Validator/Regex/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Regex/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/RegexCest.php b/tests/integration/Validation/Validator/RegexCest.php
index 0896af78aec..9873214c936 100644
--- a/tests/integration/Validation/Validator/RegexCest.php
+++ b/tests/integration/Validation/Validator/RegexCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/SetOptionCest.php b/tests/integration/Validation/Validator/SetOptionCest.php
index 7b69a52b11c..b2c0554cc01 100644
--- a/tests/integration/Validation/Validator/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/SetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/StringLength/ConstructCest.php b/tests/integration/Validation/Validator/StringLength/ConstructCest.php
index 8556c287663..b60dd1595f6 100644
--- a/tests/integration/Validation/Validator/StringLength/ConstructCest.php
+++ b/tests/integration/Validation/Validator/StringLength/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength;
 use Phalcon\Validation\ValidatorCompositeInterface;
 
diff --git a/tests/integration/Validation/Validator/StringLength/GetOptionCest.php b/tests/integration/Validation/Validator/StringLength/GetOptionCest.php
index d5f6eeae2ea..6f0e116543e 100644
--- a/tests/integration/Validation/Validator/StringLength/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength;
 
 /**
diff --git a/tests/integration/Validation/Validator/StringLength/GetTemplateCest.php b/tests/integration/Validation/Validator/StringLength/GetTemplateCest.php
index 784563de1a6..c02554eb9d8 100644
--- a/tests/integration/Validation/Validator/StringLength/GetTemplateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/GetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use Phalcon\Validation\Validator\StringLength;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php b/tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php
index 3f119443bb8..179f5537d44 100644
--- a/tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php
+++ b/tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php b/tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php
index 1fceff2cb82..b0036f41e5a 100644
--- a/tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php
+++ b/tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use Phalcon\Validation\Validator\StringLength;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/StringLength/HasOptionCest.php b/tests/integration/Validation/Validator/StringLength/HasOptionCest.php
index 58347871b91..2474821387d 100644
--- a/tests/integration/Validation/Validator/StringLength/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength;
 
 /**
diff --git a/tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php b/tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php
index dd4247b1652..d91e4f15675 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength\Max;
 
 class ConstructCest
diff --git a/tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php b/tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php
index 1c140e206fd..99ce0fc9693 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php b/tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php
index a546c05a0b7..30a93aabc94 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php b/tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php
index 99fdad2cbcc..7aafb0269d7 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php b/tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php
index 90e851e5de4..c4020d343fa 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php b/tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php
index f4933432262..b911d4c04fa 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php b/tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php
index 22607173e45..caa75945177 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength;
 
 class SetOptionCest
diff --git a/tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php b/tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php
index 8c4f7326ee2..daedb77d8e2 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php b/tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php
index c32167956e1..77fb330da8a 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php b/tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php
index 8b0543a2793..1d8604f6ec5 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php b/tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php
index 9870edb5ac5..6f8513500ff 100644
--- a/tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php
+++ b/tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php b/tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php
index d321c906afc..a15d2711b08 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength\Min;
 
 class ConstructCest
diff --git a/tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php b/tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php
index 904b629d058..76b2b81c2d5 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php b/tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php
index 1960027ae2c..52a1b42608f 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php b/tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php
index 25a13b169b5..d3031e824a1 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php b/tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php
index e67c5bfb97a..b6f9235a7c9 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php b/tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php
index 8e4d9ec4348..f95e67241e4 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php b/tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php
index 7e53b0a9391..2d2098e062d 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength;
 
 class SetOptionCest
diff --git a/tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php b/tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php
index 5c072b10676..d7ff0912be0 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php b/tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php
index ea17e77ad14..176991dd46d 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php b/tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php
index 05d983d6ad6..8ac1af85a31 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Validation;
diff --git a/tests/integration/Validation/Validator/StringLength/SetOptionCest.php b/tests/integration/Validation/Validator/StringLength/SetOptionCest.php
index 80c7c10a044..14046422a4b 100644
--- a/tests/integration/Validation/Validator/StringLength/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/StringLength/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\StringLength;
 
 /**
diff --git a/tests/integration/Validation/Validator/StringLength/SetTemplateCest.php b/tests/integration/Validation/Validator/StringLength/SetTemplateCest.php
index 78b501e3eba..e8703cbfbbe 100644
--- a/tests/integration/Validation/Validator/StringLength/SetTemplateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/SetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use Phalcon\Validation\Validator\StringLength;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php b/tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php
index dfc7efed751..25cd34ee002 100644
--- a/tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php
+++ b/tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use Phalcon\Validation\Validator\StringLength;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/StringLength/ValidateCest.php b/tests/integration/Validation/Validator/StringLength/ValidateCest.php
index d3ef43d8d3a..6ab44ec15ec 100644
--- a/tests/integration/Validation/Validator/StringLength/ValidateCest.php
+++ b/tests/integration/Validation/Validator/StringLength/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
diff --git a/tests/integration/Validation/Validator/Uniqueness/ConstructCest.php b/tests/integration/Validation/Validator/Uniqueness/ConstructCest.php
index 271b448b6ec..f247ccc43d5 100644
--- a/tests/integration/Validation/Validator/Uniqueness/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Uniqueness/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Uniqueness;
 
 /**
diff --git a/tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php b/tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php
index 69bb055fd85..faf25074f59 100644
--- a/tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Uniqueness;
 
 /**
diff --git a/tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php b/tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php
index 3c9a5a1f244..7484e77ac71 100644
--- a/tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Uniqueness;
 
 /**
diff --git a/tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php b/tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php
index 4b34709a8e3..8deb9fe73ff 100644
--- a/tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Uniqueness;
 
 /**
diff --git a/tests/integration/Validation/Validator/Url/ConstructCest.php b/tests/integration/Validation/Validator/Url/ConstructCest.php
index 0197b24268a..293b9ac1d03 100644
--- a/tests/integration/Validation/Validator/Url/ConstructCest.php
+++ b/tests/integration/Validation/Validator/Url/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Url;
 
 /**
diff --git a/tests/integration/Validation/Validator/Url/GetOptionCest.php b/tests/integration/Validation/Validator/Url/GetOptionCest.php
index 27cf343d7f0..42cb9a10de1 100644
--- a/tests/integration/Validation/Validator/Url/GetOptionCest.php
+++ b/tests/integration/Validation/Validator/Url/GetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Url;
 
 /**
diff --git a/tests/integration/Validation/Validator/Url/HasOptionCest.php b/tests/integration/Validation/Validator/Url/HasOptionCest.php
index c776af07e0a..3c722f68b9c 100644
--- a/tests/integration/Validation/Validator/Url/HasOptionCest.php
+++ b/tests/integration/Validation/Validator/Url/HasOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Url;
 
 /**
diff --git a/tests/integration/Validation/Validator/Url/SetOptionCest.php b/tests/integration/Validation/Validator/Url/SetOptionCest.php
index c8d4a91b449..d14e77d2d41 100644
--- a/tests/integration/Validation/Validator/Url/SetOptionCest.php
+++ b/tests/integration/Validation/Validator/Url/SetOptionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\ValidationTrait;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Validation\Validator\Url;
 
 /**
diff --git a/tests/integration/Validation/Validator/Url/ValidateCest.php b/tests/integration/Validation/Validator/Url/ValidateCest.php
index a0f769e66ba..fb78e37b090 100644
--- a/tests/integration/Validation/Validator/Url/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Url/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Validation\Validator\Url;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/ValidateCest.php b/tests/integration/Validation/Validator/ValidateCest.php
index 75028cf9519..8fec5ab6734 100644
--- a/tests/integration/Validation/Validator/ValidateCest.php
+++ b/tests/integration/Validation/Validator/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/ValidatorFactory/NewInstanceCest.php b/tests/integration/Validation/ValidatorFactory/NewInstanceCest.php
index 6589c62f025..29cc8187cd1 100644
--- a/tests/integration/Validation/ValidatorFactory/NewInstanceCest.php
+++ b/tests/integration/Validation/ValidatorFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Validation\ValidatorFactory;
+namespace Phalcon\Tests\Integration\Validation\ValidatorFactory;
 
 use IntegrationTester;
 use Phalcon\Validation\Validator\Alnum;
diff --git a/tests/syntax/phql/003.phpt b/tests/syntax/phql/003.phpt
index 118990cfba7..8e8a57d1481 100644
--- a/tests/syntax/phql/003.phpt
+++ b/tests/syntax/phql/003.phpt
@@ -10,7 +10,7 @@ var_dump(Lang::parsePHQL(<<<PHQL
 SELECT
   AVG(inv_total) AS average
 FROM
-  [Phalcon\Test\Models\Invoices]
+  [Phalcon\Tests\Models\Invoices]
 PHQL
 ));
 ?>
@@ -54,7 +54,7 @@ array(3) {
         ["type"]=>
         int(355)
         ["name"]=>
-        string(28) "Phalcon\Test\Models\Invoices"
+        string(28) "Phalcon\Tests\Models\Invoices"
       }
     }
   }
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/DbDescribeMysqlCest.php b/tests/tocheck-database/Db/Adapter/Pdo/DbDescribeMysqlCest.php
index 947c1097e38..e1c47801a37 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/DbDescribeMysqlCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/DbDescribeMysqlCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
 use Phalcon\Db\Index;
 use Phalcon\Db\Reference;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DbDescribeMysqlCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/DbDescribePostgresqlCest.php b/tests/tocheck-database/Db/Adapter/Pdo/DbDescribePostgresqlCest.php
index 80fffab9a9a..8773816d741 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/DbDescribePostgresqlCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/DbDescribePostgresqlCest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DbDescribePostgresqlCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddForeignKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddForeignKeyCest.php
index 3a90ba267cb..be2488adfe6 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddIndexCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddIndexCest.php
index 828da22c06c..507bd0641d9 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddIndexCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddPrimaryKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddPrimaryKeyCest.php
index 064162d8f8d..f38a619e930 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AddPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AffectedRowsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AffectedRowsCest.php
index db2d0da60e7..38491a0d3ec 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AffectedRowsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/AffectedRowsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/BeginCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/BeginCest.php
index 3a31350d6a1..143502e6f4f 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/BeginCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CloseCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CloseCest.php
index 61451f6381c..fb516f70e73 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CloseCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CommitCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CommitCest.php
index 07d1eef6420..6d16a48f020 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CommitCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConnectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConnectCest.php
index d125f4edfea..d85ed87b7e0 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConnectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConnectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConstructCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConstructCest.php
index fb190e9916d..792762d7ecb 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConstructCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConvertBoundParamsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConvertBoundParamsCest.php
index fd3c7065ad6..04c73203b09 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConvertBoundParamsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ConvertBoundParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateSavepointCest.php
index 19d47cf3cc1..532218f76a9 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateViewCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateViewCest.php
index 92fbd953daf..5529fb6933a 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateViewCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/CreateViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DeleteCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DeleteCest.php
index 479e78fe5d5..511b8892076 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DeleteCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeColumnsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeColumnsCest.php
index e4c42c06930..d66172fdf7e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeColumnsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeColumnsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\MysqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\MysqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeColumnsCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeIndexesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeIndexesCest.php
index 2101a4e3b50..9d2bfae09ac 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeIndexesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeIndexesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\MysqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\MysqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeIndexesCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeReferencesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeReferencesCest.php
index 488b2cc347c..dd79b1ad1ee 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeReferencesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DescribeReferencesCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Reference;
-use Phalcon\Test\Fixtures\Traits\Db\MysqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\MysqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeReferencesCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropColumnCest.php
index e00bedb2901..8824a2484b3 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropForeignKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropForeignKeyCest.php
index fbf700f02ca..0ff4423e3a9 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropIndexCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropIndexCest.php
index 984196f4a00..b6ff0227c43 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropIndexCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropPrimaryKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropPrimaryKeyCest.php
index 6be646abd20..2046e29c949 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropTableCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropTableCest.php
index 63987ff51e5..eee843b3894 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropTableCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropViewCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropViewCest.php
index e7629009600..262c2802e86 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropViewCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/DropViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeIdentifierCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeIdentifierCest.php
index 43bca431e15..e913111c8a8 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeIdentifierCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeIdentifierCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\MysqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\MysqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class EscapeIdentifierCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeStringCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeStringCest.php
index 3947d0e4773..4df9807f8af 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeStringCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/EscapeStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecuteCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecuteCest.php
index ae2db38a843..b1d9f2527fa 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecuteCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecuteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecutePreparedCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecutePreparedCest.php
index 6fe7b0071b3..899200f6cf3 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecutePreparedCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ExecutePreparedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchAllCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchAllCest.php
index 0a46f92a996..a346d9a6729 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchAllCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchColumnCest.php
index 08ed3b1e3e1..2e83a2bf172 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchOneCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchOneCest.php
index 5d46612d219..7c693d0becc 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchOneCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/FetchOneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ForUpdateCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ForUpdateCest.php
index 797623c7faf..ee2d72753cb 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ForUpdateCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnDefinitionCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnDefinitionCest.php
index 94d93fe9377..94d3b07ef71 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnDefinitionCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnDefinitionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnListCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnListCest.php
index 00bd34708e2..1824380dfb2 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnListCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetColumnListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetConnectionIdCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetConnectionIdCest.php
index 3a9c953b4be..b5bccfb3c53 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetConnectionIdCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetConnectionIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultIdValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultIdValueCest.php
index 54070939724..0f2a7f27c27 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultIdValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultIdValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultValueCest.php
index e2f240bdc33..a9800ddb574 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDefaultValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDescriptorCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDescriptorCest.php
index 1eaba23afef..75600cc4a3e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDescriptorCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDescriptorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectCest.php
index 32c6da2663b..62da6721e79 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectTypeCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectTypeCest.php
index ad762f8439e..b3044171ea5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectTypeCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetDialectTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetErrorInfoCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetErrorInfoCest.php
index 93777bc651c..aad6250885d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetErrorInfoCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetErrorInfoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetEventsManagerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetEventsManagerCest.php
index b35cc6b401e..d2d4a60ce91 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetEventsManagerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetInternalHandlerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetInternalHandlerCest.php
index aa76ce67ba1..a017acf30b4 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetInternalHandlerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetInternalHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetNestedTransactionSavepointNameCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetNestedTransactionSavepointNameCest.php
index bd29d39a09d..faf923bd42d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetNestedTransactionSavepointNameCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetNestedTransactionSavepointNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetRealSQLStatementCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetRealSQLStatementCest.php
index 40ebc04135e..18b6941e14d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetRealSQLStatementCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetRealSQLStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLBindTypesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLBindTypesCest.php
index 5d94dd31648..29c1680f2dd 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLBindTypesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLStatementCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLStatementCest.php
index 6eab72f838c..d0eb3a0eefd 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLStatementCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSQLStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSqlVariablesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSqlVariablesCest.php
index a0e6b251b97..e2a98ee170c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSqlVariablesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetSqlVariablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTransactionLevelCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTransactionLevelCest.php
index f4fabaf25e4..c7bf3f7a463 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTransactionLevelCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTransactionLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTypeCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTypeCest.php
index 16957eacc23..2af6f6aa959 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTypeCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertAsDictCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertAsDictCest.php
index 14df30784ae..957aa94b923 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertAsDictCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertAsDictCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertCest.php
index 646bc9ab59c..4eb8eaedb10 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/InsertCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsNestedTransactionsWithSavepointsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsNestedTransactionsWithSavepointsCest.php
index efd4c1f1e50..7bcbb3c5968 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsNestedTransactionsWithSavepointsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsNestedTransactionsWithSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsUnderTransactionCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsUnderTransactionCest.php
index b066228eb6a..d01719bee91 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsUnderTransactionCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/IsUnderTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LastInsertIdCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LastInsertIdCest.php
index 0a739df4a0b..cca1922cca5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LastInsertIdCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LastInsertIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LimitCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LimitCest.php
index 12027ba88eb..ab6cba584ca 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LimitCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/LimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListTablesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListTablesCest.php
index a27837af645..5dd1434849a 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListTablesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListTablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 use PDOException;
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListViewsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListViewsCest.php
index 458924af6fa..e3878b0331b 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListViewsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ListViewsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/PrepareCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/PrepareCest.php
index 98605f13df5..40d37ecc74e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/PrepareCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/PrepareCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ReleaseSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ReleaseSavepointCest.php
index 9cbcc6c1d3c..f50d57c3ae4 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ReleaseSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ReleaseSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackCest.php
index 75396b451ff..7d430a1f3d8 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackSavepointCest.php
index bf6e81c9b2a..ae40e224db7 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/RollbackSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetDialectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetDialectCest.php
index e83d0a3873c..12f2f4605e2 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetDialectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetDialectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetEventsManagerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetEventsManagerCest.php
index 13062f3669f..245e757ab80 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetEventsManagerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetNestedTransactionsWithSavepointsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetNestedTransactionsWithSavepointsCest.php
index 8e7cfd8fdbe..0492097e0e5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetNestedTransactionsWithSavepointsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SetNestedTransactionsWithSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SharedLockCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SharedLockCest.php
index 20fd80110fd..ee9fbf64f02 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SharedLockCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SupportSequencesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SupportSequencesCest.php
index 37346d28ec8..b553b92d835 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SupportSequencesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/SupportSequencesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableExistsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableExistsCest.php
index be2370dca8c..a1740a40f61 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableExistsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableExistsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\MysqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\MysqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class TableExistsCest
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableOptionsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableOptionsCest.php
index a7b5233234e..a502bf80eda 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableOptionsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/TableOptionsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\MysqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\MysqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class TableOptionsCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateAsDictCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateAsDictCest.php
index c2dffebc8a8..f3153214834 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateAsDictCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateAsDictCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateCest.php
index 613563e2f65..be276f3676b 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UseExplicitIdValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UseExplicitIdValueCest.php
index 24fd5959206..462771146b0 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UseExplicitIdValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/UseExplicitIdValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ViewExistsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ViewExistsCest.php
index 3ca4160b8b1..0043f6dcdcb 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ViewExistsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Mysql/ViewExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/MysqlCest.php b/tests/tocheck-database/Db/Adapter/Pdo/MysqlCest.php
index 5456bebb971..a737323520c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/MysqlCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/MysqlCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo;
 
 use Codeception\Example;
 use IntegrationTester;
 use PDOException;
 use Phalcon\Db\Adapter\Pdo\Mysql;
-use Phalcon\Test\Integration\Db\Dialect\Helper\MysqlHelper;
+use Phalcon\Tests\Integration\Db\Dialect\Helper\MysqlHelper;
 
 class MysqlCest extends MysqlHelper
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddColumnCest.php
index ca07920f200..f0835faa8bf 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddForeignKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddForeignKeyCest.php
index aac2539d8b2..883ef8bdb52 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddIndexCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddIndexCest.php
index 3c0e53c79ef..9758e72c5e4 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddIndexCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddPrimaryKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddPrimaryKeyCest.php
index 24a13280a8c..ec4dff4e985 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AddPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AffectedRowsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AffectedRowsCest.php
index 069b82f363f..4ca7363620b 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AffectedRowsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/AffectedRowsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/BeginCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/BeginCest.php
index a246641a425..9e2edad735a 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/BeginCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CloseCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CloseCest.php
index 7e6abdd4edc..8a2e3c6954d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CloseCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CommitCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CommitCest.php
index 02cbd1251fb..95d1970f206 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CommitCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConnectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConnectCest.php
index 2d69165a4a1..6168c527d02 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConnectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConnectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConstructCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConstructCest.php
index c144dadf557..6a38174f32e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConstructCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConvertBoundParamsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConvertBoundParamsCest.php
index c34bfb04bf2..37910f620fc 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConvertBoundParamsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ConvertBoundParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateSavepointCest.php
index 2a63f87c377..4f119a75f61 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateTableCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateTableCest.php
index 46daf7c13d2..fec7b1f10dc 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateTableCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateViewCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateViewCest.php
index 52e867d1b04..1dcc4867edb 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateViewCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/CreateViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DeleteCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DeleteCest.php
index e13aef15afc..1200ffdec3a 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DeleteCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeColumnsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeColumnsCest.php
index 97770de88ac..aaa82f78eb4 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeColumnsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeColumnsCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
-use Phalcon\Test\Fixtures\Traits\Db\PostgresqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\PostgresqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeColumnsCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeIndexesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeIndexesCest.php
index 831ead868d1..7776b0e5dbb 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeIndexesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeIndexesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeReferencesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeReferencesCest.php
index daf61a66dc6..daa66a8f356 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeReferencesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DescribeReferencesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\PostgresqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\PostgresqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeReferencesCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropColumnCest.php
index 4dad4d63fa0..b19ecbf3177 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropForeignKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropForeignKeyCest.php
index 04ea0a6f40f..4463ebff216 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropIndexCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropIndexCest.php
index 5417cd87c5f..6d65b2d8569 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropIndexCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropPrimaryKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropPrimaryKeyCest.php
index 6d00bdead6b..44e5f84d668 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropTableCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropTableCest.php
index 81d1fa037b0..cc654af1f96 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropTableCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropViewCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropViewCest.php
index 32fa3968ea1..de213507c66 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropViewCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/DropViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeIdentifierCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeIdentifierCest.php
index cb712c39efb..99fc3ec859e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeIdentifierCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeIdentifierCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeStringCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeStringCest.php
index ba18d817e5f..172afa73d25 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeStringCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/EscapeStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecuteCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecuteCest.php
index 0e6fe56e3c7..0933d96609c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecuteCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecuteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecutePreparedCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecutePreparedCest.php
index 10eb6cf7580..fa6c6f8a3b2 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecutePreparedCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ExecutePreparedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchAllCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchAllCest.php
index 4d408fd7374..95392133307 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchAllCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchColumnCest.php
index bec06c2f303..e544f1a114e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchOneCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchOneCest.php
index 279e88e6ece..a127499d2ff 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchOneCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/FetchOneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ForUpdateCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ForUpdateCest.php
index 009b99e07f6..16202fdd6cf 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ForUpdateCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnDefinitionCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnDefinitionCest.php
index 5978685d317..5502a20636e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnDefinitionCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnDefinitionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnListCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnListCest.php
index 218f7dae134..97e11f6ef39 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnListCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetColumnListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetConnectionIdCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetConnectionIdCest.php
index 851d258298c..c3fba61355d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetConnectionIdCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetConnectionIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultIdValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultIdValueCest.php
index fb9e026aa34..ca11a2de6c5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultIdValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultIdValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultValueCest.php
index efb40199215..8cc404084fd 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDefaultValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDescriptorCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDescriptorCest.php
index ea37203aa13..5b832e6de3b 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDescriptorCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDescriptorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectCest.php
index 41471978a45..bb2375847e7 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectTypeCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectTypeCest.php
index 31c00830cc6..5fd8f80bc02 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectTypeCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetDialectTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetErrorInfoCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetErrorInfoCest.php
index 334a2d64afc..2e64463de5f 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetErrorInfoCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetErrorInfoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetEventsManagerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetEventsManagerCest.php
index 40ee1e0f94d..427639f3413 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetEventsManagerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetInternalHandlerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetInternalHandlerCest.php
index 634a3ea0508..ff695d90796 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetInternalHandlerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetInternalHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetNestedTransactionSavepointNameCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetNestedTransactionSavepointNameCest.php
index 7c3d8f81a7c..9e4c1b5f269 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetNestedTransactionSavepointNameCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetNestedTransactionSavepointNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetRealSQLStatementCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetRealSQLStatementCest.php
index b26960eaf33..d912f7345e1 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetRealSQLStatementCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetRealSQLStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLBindTypesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLBindTypesCest.php
index 692c08ef9dd..406c6f46266 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLBindTypesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLStatementCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLStatementCest.php
index b35bf0828dd..65fd81ef62f 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLStatementCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSQLStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSqlVariablesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSqlVariablesCest.php
index 1cc419d947a..b1fa01b2ab1 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSqlVariablesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetSqlVariablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTransactionLevelCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTransactionLevelCest.php
index 15ce738290b..3d8ebdfeadb 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTransactionLevelCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTransactionLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTypeCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTypeCest.php
index 30cf12ef52a..7b2cc89315d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTypeCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertAsDictCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertAsDictCest.php
index 05ed5cc5b17..34510ccb4af 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertAsDictCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertAsDictCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertCest.php
index 868fa1946f7..4d4f2220403 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/InsertCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsNestedTransactionsWithSavepointsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsNestedTransactionsWithSavepointsCest.php
index 17b456d25f4..a37f5587a04 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsNestedTransactionsWithSavepointsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsNestedTransactionsWithSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsUnderTransactionCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsUnderTransactionCest.php
index 99ea512ec5e..0c72e5d0d93 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsUnderTransactionCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/IsUnderTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LastInsertIdCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LastInsertIdCest.php
index 9ed616b83e1..87184710dd2 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LastInsertIdCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LastInsertIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LimitCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LimitCest.php
index 68d6f1e0e59..1c982a05792 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LimitCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/LimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListTablesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListTablesCest.php
index 3503e89444e..fe5833240e6 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListTablesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListTablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListViewsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListViewsCest.php
index 2687356c526..26abbcd2eda 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListViewsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ListViewsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ModifyColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ModifyColumnCest.php
index 63d7325e472..5c39dd3d715 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ModifyColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ModifyColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/PrepareCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/PrepareCest.php
index 066aa208127..191b2b543a2 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/PrepareCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/PrepareCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/QueryCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/QueryCest.php
index f967df184c7..4c0a6753251 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/QueryCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/QueryCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Enum;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use function is_object;
 
 class QueryCest
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ReleaseSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ReleaseSavepointCest.php
index 15d09193814..baa05c7927d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ReleaseSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ReleaseSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackCest.php
index 4269f0d0850..09ad3f32a11 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackSavepointCest.php
index 02f4d120bd7..3c27f659cf9 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/RollbackSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetDialectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetDialectCest.php
index ab03c76188d..0bf3e99f44e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetDialectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetDialectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetEventsManagerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetEventsManagerCest.php
index 03355daf562..9158f0af8e6 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetEventsManagerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetNestedTransactionsWithSavepointsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetNestedTransactionsWithSavepointsCest.php
index 8bc156b879f..e53bc43938e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetNestedTransactionsWithSavepointsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SetNestedTransactionsWithSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SharedLockCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SharedLockCest.php
index 3b095a62a30..005b625d56c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SharedLockCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SupportSequencesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SupportSequencesCest.php
index b964a4dc33c..57be75e4487 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SupportSequencesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/SupportSequencesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableExistsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableExistsCest.php
index 4d7065c8352..af12af5904e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableExistsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableExistsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\Db\PostgresqlTrait;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\Db\PostgresqlTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class TableExistsCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableOptionsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableOptionsCest.php
index df802814cdc..f882f9ffd46 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableOptionsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/TableOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateAsDictCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateAsDictCest.php
index 9f8c53a1b52..4a9d70b3783 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateAsDictCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateAsDictCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateCest.php
index 3862db52c6b..420fdbc6848 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UseExplicitIdValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UseExplicitIdValueCest.php
index 8b69691d0b3..2a327447195 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UseExplicitIdValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/UseExplicitIdValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ViewExistsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ViewExistsCest.php
index 6cd68a8edb3..9f83b2d79fd 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ViewExistsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Postgresql/ViewExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/PostgresqlCest.php b/tests/tocheck-database/Db/Adapter/Pdo/PostgresqlCest.php
index 69d6322adbc..a74071ee70d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/PostgresqlCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/PostgresqlCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql as DialectPostgresql;
 use Phalcon\Db\Reference;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function env;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddColumnCest.php
index 08aaf6c33cc..58d6e9c0135 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddForeignKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddForeignKeyCest.php
index b173e9a65fc..42742ddbfa5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddIndexCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddIndexCest.php
index e77a6d0118d..d4a9a5648ea 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddIndexCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddPrimaryKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddPrimaryKeyCest.php
index 272262186d9..2d68684777f 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AddPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AffectedRowsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AffectedRowsCest.php
index 6799a968ea1..05e2a5f9384 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AffectedRowsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/AffectedRowsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/BeginCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/BeginCest.php
index 05651198d1f..6907798174b 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/BeginCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CloseCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CloseCest.php
index 02779f0f965..68f37474ec4 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CloseCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CommitCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CommitCest.php
index 569a57543f4..77e3faafd9e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CommitCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConnectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConnectCest.php
index 27f904de650..69b9c674855 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConnectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConnectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConstructCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConstructCest.php
index c054f4f2a1b..c0e84feed95 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConstructCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConvertBoundParamsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConvertBoundParamsCest.php
index 76490bb3a4b..1b9aba6e39e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConvertBoundParamsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ConvertBoundParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateSavepointCest.php
index bca1325c77c..1ece2400fda 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateTableCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateTableCest.php
index ce2efc74dab..84d4374c1da 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateTableCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateViewCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateViewCest.php
index b313035bc4e..3d38332472c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateViewCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/CreateViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DeleteCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DeleteCest.php
index ce9101e6521..2ae6dbb72d5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DeleteCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeColumnsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeColumnsCest.php
index 99fd7cc3aa4..8350a4bcabf 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeColumnsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeColumnsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeColumnsCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeIndexesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeIndexesCest.php
index ec06ec87883..18675c654d7 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeIndexesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeIndexesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Index;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeIndexesCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeReferencesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeReferencesCest.php
index eea2270a485..3384c767715 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeReferencesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DescribeReferencesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Reference;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DescribeReferencesCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropColumnCest.php
index 8cf65bb862e..4066e590333 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropForeignKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropForeignKeyCest.php
index 4f579e3e031..f065ad81be9 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropIndexCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropIndexCest.php
index c00612616ce..3a7ff67486d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropIndexCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropPrimaryKeyCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropPrimaryKeyCest.php
index a39bd376648..b5eab0fad30 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropTableCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropTableCest.php
index 7829f0bab2f..0bb1d5c4299 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropTableCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropViewCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropViewCest.php
index ca2fd16bc32..f70b323f40e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropViewCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/DropViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeIdentifierCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeIdentifierCest.php
index 9560b73cafb..64fd74e1506 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeIdentifierCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeIdentifierCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeStringCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeStringCest.php
index f67b571d159..c56258f55f6 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeStringCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/EscapeStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecuteCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecuteCest.php
index 79971d91042..7c72076c764 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecuteCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecuteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecutePreparedCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecutePreparedCest.php
index e8b0f3e2b3b..c02b501f412 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecutePreparedCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ExecutePreparedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchAllCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchAllCest.php
index 99c1f3b054c..7bd82b21ba0 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchAllCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchColumnCest.php
index daf1fcab073..138c399ff38 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchOneCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchOneCest.php
index 3cd1d331f02..994fddb0434 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchOneCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/FetchOneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ForUpdateCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ForUpdateCest.php
index caac4147cad..91c68248042 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ForUpdateCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnDefinitionCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnDefinitionCest.php
index 31f10255bfb..5ff9a76fdd3 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnDefinitionCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnDefinitionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnListCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnListCest.php
index 1e0cea0b9e0..d44ef5ede7c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnListCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetColumnListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetConnectionIdCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetConnectionIdCest.php
index fe3ada95f57..89317915278 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetConnectionIdCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetConnectionIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultIdValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultIdValueCest.php
index 196f9ee0767..77c0646f2b0 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultIdValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultIdValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultValueCest.php
index 5bb700f625e..9a06010d020 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDefaultValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDescriptorCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDescriptorCest.php
index 0ae8f3d740f..08f09e3019d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDescriptorCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDescriptorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectCest.php
index 4611c3d3083..f99eed18314 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectTypeCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectTypeCest.php
index 77c125d8661..12edd30a7cf 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectTypeCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetDialectTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetErrorInfoCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetErrorInfoCest.php
index a510d3b373b..949fdbd634e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetErrorInfoCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetErrorInfoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetEventsManagerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetEventsManagerCest.php
index cdbee725767..14b0c7487ef 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetEventsManagerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetInternalHandlerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetInternalHandlerCest.php
index 0661eb245ba..a99c03c9cee 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetInternalHandlerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetInternalHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetNestedTransactionSavepointNameCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetNestedTransactionSavepointNameCest.php
index 2afe4cee665..f1783a6a984 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetNestedTransactionSavepointNameCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetNestedTransactionSavepointNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetRealSQLStatementCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetRealSQLStatementCest.php
index c74a2f8f8a4..553d10aede5 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetRealSQLStatementCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetRealSQLStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLBindTypesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLBindTypesCest.php
index ead9061efd6..9bee272fbbc 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLBindTypesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLStatementCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLStatementCest.php
index e1f93906493..645417eb59d 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLStatementCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSQLStatementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSqlVariablesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSqlVariablesCest.php
index ddba1b64c26..8c40cb9e927 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSqlVariablesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetSqlVariablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTransactionLevelCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTransactionLevelCest.php
index c0113d25ff7..9698a679b15 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTransactionLevelCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTransactionLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTypeCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTypeCest.php
index caaa78cc8ad..7a7efa65b34 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTypeCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertAsDictCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertAsDictCest.php
index cbe612962b3..5b151ca2f7b 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertAsDictCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertAsDictCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertCest.php
index cf3faf681df..13b52e1b342 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/InsertCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsNestedTransactionsWithSavepointsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsNestedTransactionsWithSavepointsCest.php
index a9ff0d9fad7..ef8f5df2e15 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsNestedTransactionsWithSavepointsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsNestedTransactionsWithSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsUnderTransactionCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsUnderTransactionCest.php
index 5672b5e1a81..7d589c3a7c6 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsUnderTransactionCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/IsUnderTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LastInsertIdCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LastInsertIdCest.php
index 88556af3147..fd9d4cf6910 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LastInsertIdCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LastInsertIdCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LimitCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LimitCest.php
index abbf934f1e7..3952dde6751 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LimitCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/LimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListTablesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListTablesCest.php
index cd581ee152f..7c1831bdfdf 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListTablesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListTablesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ListTablesCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListViewsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListViewsCest.php
index afd8f07fa2f..e27e98dcb10 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListViewsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ListViewsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ModifyColumnCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ModifyColumnCest.php
index fa25e8509a1..5301dbba04e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ModifyColumnCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ModifyColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/PrepareCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/PrepareCest.php
index c8f42029aa0..85909b6df0f 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/PrepareCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/PrepareCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/QueryCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/QueryCest.php
index 339c7d431d9..47dce7e9160 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/QueryCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/QueryCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Enum;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use function is_array;
 
 class QueryCest
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ReleaseSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ReleaseSavepointCest.php
index 06e4d027d2a..4196e68dce3 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ReleaseSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ReleaseSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackCest.php
index 24a50b02e3c..f86600bfb2c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackSavepointCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackSavepointCest.php
index a93c7b7818d..b36d080d4f3 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackSavepointCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/RollbackSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetDialectCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetDialectCest.php
index d71b2a9ad5a..560337b5d3c 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetDialectCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetDialectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetEventsManagerCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetEventsManagerCest.php
index e18fe68678a..e43d86d9c67 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetEventsManagerCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetNestedTransactionsWithSavepointsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetNestedTransactionsWithSavepointsCest.php
index 6010bb87694..8d031cf0037 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetNestedTransactionsWithSavepointsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SetNestedTransactionsWithSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SharedLockCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SharedLockCest.php
index 80b284cd019..41c0f97e438 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SharedLockCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SupportSequencesCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SupportSequencesCest.php
index 1cfe1ffcf76..60efebd15e6 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SupportSequencesCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/SupportSequencesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableExistsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableExistsCest.php
index 713990102ae..312138ec84e 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableExistsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableExistsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class TableExistsCest
 {
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableOptionsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableOptionsCest.php
index 3d44fc00e49..a3bafb91ea2 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableOptionsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/TableOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateAsDictCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateAsDictCest.php
index 3d11a489b60..7ef42460316 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateAsDictCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateAsDictCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateCest.php
index 03b14e5dc38..a8c45838927 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UseExplicitIdValueCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UseExplicitIdValueCest.php
index b2f66b5f067..47d3a0908ca 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UseExplicitIdValueCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/UseExplicitIdValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ViewExistsCest.php b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ViewExistsCest.php
index a2f14fe25eb..67e58137a4f 100644
--- a/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ViewExistsCest.php
+++ b/tests/tocheck-database/Db/Adapter/Pdo/Sqlite/ViewExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Adapter/PdoFactory/LoadCest.php b/tests/tocheck-database/Db/Adapter/PdoFactory/LoadCest.php
index 55dfe1fe5a4..9d08c87db66 100644
--- a/tests/tocheck-database/Db/Adapter/PdoFactory/LoadCest.php
+++ b/tests/tocheck-database/Db/Adapter/PdoFactory/LoadCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\PdoFactory;
+namespace Phalcon\Tests\Integration\Db\Adapter\PdoFactory;
 
 use IntegrationTester;
 use Phalcon\Db\Adapter\Pdo\Mysql;
 use Phalcon\Db\Adapter\PdoFactory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 
 use function array_intersect_assoc;
 
diff --git a/tests/tocheck-database/Db/Adapter/PdoFactory/NewInstanceCest.php b/tests/tocheck-database/Db/Adapter/PdoFactory/NewInstanceCest.php
index 9d6322ba1fc..eed1926e1ff 100644
--- a/tests/tocheck-database/Db/Adapter/PdoFactory/NewInstanceCest.php
+++ b/tests/tocheck-database/Db/Adapter/PdoFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Adapter\PdoFactory;
+namespace Phalcon\Tests\Integration\Db\Adapter\PdoFactory;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Column/HasDefaultCest.php b/tests/tocheck-database/Db/Column/HasDefaultCest.php
index a0e1171d27e..cbcba0de53c 100644
--- a/tests/tocheck-database/Db/Column/HasDefaultCest.php
+++ b/tests/tocheck-database/Db/Column/HasDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Column;
+namespace Phalcon\Tests\Integration\Db\Column;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Column/IsAutoIncrementCest.php b/tests/tocheck-database/Db/Column/IsAutoIncrementCest.php
index 3d076652edb..5d28aa629e2 100644
--- a/tests/tocheck-database/Db/Column/IsAutoIncrementCest.php
+++ b/tests/tocheck-database/Db/Column/IsAutoIncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Column;
+namespace Phalcon\Tests\Integration\Db\Column;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/ColumnCest.php b/tests/tocheck-database/Db/ColumnCest.php
index 1b4ae90ce8c..cbe2fe7a874 100644
--- a/tests/tocheck-database/Db/ColumnCest.php
+++ b/tests/tocheck-database/Db/ColumnCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db;
+namespace Phalcon\Tests\Integration\Db;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class ColumnCest
 {
diff --git a/tests/tocheck-database/Db/DbBindCest.php b/tests/tocheck-database/Db/DbBindCest.php
index 1031dca8094..e9445b9d88e 100644
--- a/tests/tocheck-database/Db/DbBindCest.php
+++ b/tests/tocheck-database/Db/DbBindCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db;
+namespace Phalcon\Tests\Integration\Db;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
 use Phalcon\Db\RawValue;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DbBindCest
 {
diff --git a/tests/tocheck-database/Db/DbCest.php b/tests/tocheck-database/Db/DbCest.php
index d19f7924255..c18d25bee6e 100644
--- a/tests/tocheck-database/Db/DbCest.php
+++ b/tests/tocheck-database/Db/DbCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db;
+namespace Phalcon\Tests\Integration\Db;
 
 use Codeception\Example;
 use IntegrationTester;
 use PDO;
 use Phalcon\Db\Enum;
 use Phalcon\Db\RawValue;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class DbCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Helper/MysqlHelper.php b/tests/tocheck-database/Db/Dialect/Helper/MysqlHelper.php
index 74f3864f514..77d941fd1b2 100644
--- a/tests/tocheck-database/Db/Dialect/Helper/MysqlHelper.php
+++ b/tests/tocheck-database/Db/Dialect/Helper/MysqlHelper.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Phalcon\Test\Integration\Db\Dialect\Helper;
+namespace Phalcon\Tests\Integration\Db\Dialect\Helper;
 
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class MysqlHelper
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/AddColumnCest.php b/tests/tocheck-database/Db/Dialect/Mysql/AddColumnCest.php
index 1707d7919c3..ef35cd1ee9a 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/AddColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/AddColumnCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddColumnCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/AddForeignKeyCest.php b/tests/tocheck-database/Db/Dialect/Mysql/AddForeignKeyCest.php
index 027130883df..56f272b93f4 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/AddForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/AddForeignKeyCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
 use Phalcon\Db\Reference;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddForeignKeyCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/AddIndexCest.php b/tests/tocheck-database/Db/Dialect/Mysql/AddIndexCest.php
index 726d5cca0df..ea6defe78a6 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/AddIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/AddIndexCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddIndexCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/AddPrimaryKeyCest.php b/tests/tocheck-database/Db/Dialect/Mysql/AddPrimaryKeyCest.php
index d45eefe4fc1..9afb441c18f 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/AddPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/AddPrimaryKeyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddPrimaryKeyCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/CreateSavepointCest.php b/tests/tocheck-database/Db/Dialect/Mysql/CreateSavepointCest.php
index 86f21fc4242..079a5bb13c9 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/CreateSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/CreateSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/CreateTableCest.php b/tests/tocheck-database/Db/Dialect/Mysql/CreateTableCest.php
index 14aaf45158e..322fdc1339a 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/CreateTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/CreateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/CreateViewCest.php b/tests/tocheck-database/Db/Dialect/Mysql/CreateViewCest.php
index e9de131420b..da833588ea2 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/CreateViewCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/CreateViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DescribeColumnsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DescribeColumnsCest.php
index 573eb8b8049..d23fdeebb50 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DescribeColumnsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DescribeColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DescribeIndexesCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DescribeIndexesCest.php
index 662bfb592d0..c1de118a4c8 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DescribeIndexesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DescribeIndexesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DescribeReferencesCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DescribeReferencesCest.php
index 1b5db5540e7..33e3d9dda8b 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DescribeReferencesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DescribeReferencesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DropColumnCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DropColumnCest.php
index 505a3d666a6..40ba5524629 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DropColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DropColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DropForeignKeyCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DropForeignKeyCest.php
index 8c1654bd54d..c29a5c135e2 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DropForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DropForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DropIndexCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DropIndexCest.php
index 00e07f1ba34..e3692788d50 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DropIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DropIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DropPrimaryKeyCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DropPrimaryKeyCest.php
index 42a6d65b95f..a50237434ff 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DropPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DropPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DropTableCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DropTableCest.php
index 8448708276f..0be98796d35 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DropTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DropTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/DropViewCest.php b/tests/tocheck-database/Db/Dialect/Mysql/DropViewCest.php
index 291bc94b031..f891864fc6d 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/DropViewCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/DropViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/EscapeCest.php b/tests/tocheck-database/Db/Dialect/Mysql/EscapeCest.php
index aafa6ad25da..95d297647a5 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/EscapeCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/EscapeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/EscapeSchemaCest.php b/tests/tocheck-database/Db/Dialect/Mysql/EscapeSchemaCest.php
index 317c36b49e9..5a0409bbd0b 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/EscapeSchemaCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/EscapeSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/ForUpdateCest.php b/tests/tocheck-database/Db/Dialect/Mysql/ForUpdateCest.php
index d9b6f397192..406e42761be 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/ForUpdateCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetColumnDefinitionCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetColumnDefinitionCest.php
index 45a9ffc561a..cb0cf8e8e52 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetColumnDefinitionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetColumnDefinitionCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetColumnDefinitionCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetColumnListCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetColumnListCest.php
index 1c336adec71..cd85caba098 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetColumnListCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetColumnListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetCustomFunctionsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetCustomFunctionsCest.php
index b2c8dfb7664..3fed32ff6e6 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetCustomFunctionsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetCustomFunctionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetForeignKeyChecksCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetForeignKeyChecksCest.php
index b1a060e2680..a4134b5e03c 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetForeignKeyChecksCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetForeignKeyChecksCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetSqlColumnCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetSqlColumnCest.php
index dfbd2c71ec7..dfdb1d355c5 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetSqlColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetSqlColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetSqlExpressionCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetSqlExpressionCest.php
index 90ba6fef7a2..867b752a41d 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetSqlExpressionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetSqlExpressionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/GetSqlTableCest.php b/tests/tocheck-database/Db/Dialect/Mysql/GetSqlTableCest.php
index 86259515346..3de01a88d06 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/GetSqlTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/GetSqlTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/LimitCest.php b/tests/tocheck-database/Db/Dialect/Mysql/LimitCest.php
index 825505ce266..7b2e3413f07 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/LimitCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/LimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/ListTablesCest.php b/tests/tocheck-database/Db/Dialect/Mysql/ListTablesCest.php
index bdc18cfac08..887f6e29e73 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/ListTablesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/ListTablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/ListViewsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/ListViewsCest.php
index 7dd567289a3..36fd8ca4471 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/ListViewsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/ListViewsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/ModifyColumnCest.php b/tests/tocheck-database/Db/Dialect/Mysql/ModifyColumnCest.php
index 68854cf5304..946deb321d8 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/ModifyColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/ModifyColumnCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Column;
 use Phalcon\Db\Dialect\Mysql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class ModifyColumnCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/RegisterCustomFunctionCest.php b/tests/tocheck-database/Db/Dialect/Mysql/RegisterCustomFunctionCest.php
index f6fe36e207d..6b1fc1936d7 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/RegisterCustomFunctionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/RegisterCustomFunctionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/ReleaseSavepointCest.php b/tests/tocheck-database/Db/Dialect/Mysql/ReleaseSavepointCest.php
index d1136e1b132..427dfc37db2 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/ReleaseSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/ReleaseSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/RollbackSavepointCest.php b/tests/tocheck-database/Db/Dialect/Mysql/RollbackSavepointCest.php
index 4adce7572d9..9902834c82f 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/RollbackSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/RollbackSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/SelectCest.php b/tests/tocheck-database/Db/Dialect/Mysql/SelectCest.php
index 242278772b6..3182f6cfa56 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/SelectCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/SelectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/SharedLockCest.php b/tests/tocheck-database/Db/Dialect/Mysql/SharedLockCest.php
index db14c4197a4..935d6e0c65d 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/SharedLockCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/SupportsReleaseSavepointsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/SupportsReleaseSavepointsCest.php
index 3ba4cb653c1..a6488eeaba5 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/SupportsReleaseSavepointsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/SupportsReleaseSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/SupportsSavepointsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/SupportsSavepointsCest.php
index edf89b5d773..e4b10697ab9 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/SupportsSavepointsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/SupportsSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Mysql;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/TableExistsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/TableExistsCest.php
index 13c8e213f73..19a104d48a6 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/TableExistsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/TableExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/TableOptionsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/TableOptionsCest.php
index 0c3d69b39dd..db3378f7c2d 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/TableOptionsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/TableOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/TruncateTableCest.php b/tests/tocheck-database/Db/Dialect/Mysql/TruncateTableCest.php
index c8f9f07852c..cc480597dab 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/TruncateTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/TruncateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Mysql/ViewExistsCest.php b/tests/tocheck-database/Db/Dialect/Mysql/ViewExistsCest.php
index 050d16fafa5..adb913913dc 100644
--- a/tests/tocheck-database/Db/Dialect/Mysql/ViewExistsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Mysql/ViewExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Mysql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Mysql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/AddColumnCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/AddColumnCest.php
index 4f4e04a0289..414752d56ad 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/AddColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/AddColumnCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddColumnCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/AddForeignKeyCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/AddForeignKeyCest.php
index b410a51af27..2bdf3dbb330 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/AddForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/AddForeignKeyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddForeignKeyCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/AddIndexCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/AddIndexCest.php
index 508b32e6465..7e8d234f8de 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/AddIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/AddIndexCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddIndexCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/AddPrimaryKeyCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/AddPrimaryKeyCest.php
index 98d5bbee694..f6c49d854c1 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/AddPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/AddPrimaryKeyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddPrimaryKeyCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/CreateSavepointCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/CreateSavepointCest.php
index 315fdc2125f..b19e969a526 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/CreateSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/CreateSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/CreateTableCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/CreateTableCest.php
index 9916768e041..ab303d98e3e 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/CreateTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/CreateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/CreateViewCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/CreateViewCest.php
index 9250c7bd7dd..4e3d116fc56 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/CreateViewCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/CreateViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DescribeColumnsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DescribeColumnsCest.php
index 9fe0178202b..f5624363ba3 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DescribeColumnsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DescribeColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DescribeIndexesCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DescribeIndexesCest.php
index cc7f64ab8d8..8a4068984bf 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DescribeIndexesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DescribeIndexesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DescribeReferencesCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DescribeReferencesCest.php
index dd8b2055b9d..8a1704d1d75 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DescribeReferencesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DescribeReferencesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DropColumnCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DropColumnCest.php
index 5e585ad0523..defdd75f59d 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DropColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DropColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DropForeignKeyCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DropForeignKeyCest.php
index dc11f22afc8..cb21b14f9f2 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DropForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DropForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DropIndexCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DropIndexCest.php
index 4cd66513e8f..1d452af9c55 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DropIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DropIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DropPrimaryKeyCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DropPrimaryKeyCest.php
index 4ddf8e748ea..6cff735162c 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DropPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DropPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DropTableCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DropTableCest.php
index c0b64b8f879..4dee801df92 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DropTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DropTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/DropViewCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/DropViewCest.php
index e3006636b55..ad756bdf0fd 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/DropViewCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/DropViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/EscapeCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/EscapeCest.php
index bfd4127f62e..04ccff6b8fa 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/EscapeCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/EscapeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/EscapeSchemaCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/EscapeSchemaCest.php
index 22e61ad059b..8d16580d5fd 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/EscapeSchemaCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/EscapeSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/ForUpdateCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/ForUpdateCest.php
index 672163698c3..ab7e2da4040 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/ForUpdateCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnDefinitionCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnDefinitionCest.php
index e9aa6772a57..33fa6cfc0b9 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnDefinitionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnDefinitionCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetColumnDefinitionCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnListCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnListCest.php
index 8902fdb70b6..9d0af3dca35 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnListCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/GetColumnListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/GetCustomFunctionsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/GetCustomFunctionsCest.php
index d9e02189006..3239b629f9b 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/GetCustomFunctionsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/GetCustomFunctionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlColumnCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlColumnCest.php
index 1182b6ded48..d6ce3e8e5d7 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlExpressionCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlExpressionCest.php
index b38e39b726b..c3d107f6a2d 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlExpressionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlExpressionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlTableCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlTableCest.php
index 2858ebfc9af..acf2c7518e9 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/GetSqlTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/LimitCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/LimitCest.php
index 0853ce979c1..d2f37db1921 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/LimitCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/LimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/ListTablesCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/ListTablesCest.php
index 84d36453aff..c7fa1c519d6 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/ListTablesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/ListTablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/ListViewsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/ListViewsCest.php
index 090752c9311..6bd4155ee33 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/ListViewsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/ListViewsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/ModifyColumnCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/ModifyColumnCest.php
index e6ee89fa597..5c09f242727 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/ModifyColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/ModifyColumnCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Column;
 use Phalcon\Db\Dialect\Postgresql;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class ModifyColumnCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/RegisterCustomFunctionCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/RegisterCustomFunctionCest.php
index 6947a379646..37c4aa18526 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/RegisterCustomFunctionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/RegisterCustomFunctionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/ReleaseSavepointCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/ReleaseSavepointCest.php
index 16d9a4c01d8..8a4a17141cc 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/ReleaseSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/ReleaseSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/RollbackSavepointCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/RollbackSavepointCest.php
index 75f5c7d9f50..d70bca0da2b 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/RollbackSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/RollbackSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/SelectCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/SelectCest.php
index 7ce388e0629..a15b70dc938 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/SelectCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/SelectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/SharedLockCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/SharedLockCest.php
index a07361e54bd..e08cb2b645d 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/SharedLockCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/SupportsReleaseSavepointsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/SupportsReleaseSavepointsCest.php
index 886caf6f87c..0a7736401f8 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/SupportsReleaseSavepointsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/SupportsReleaseSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/SupportsSavepointsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/SupportsSavepointsCest.php
index ade88258e49..3a0d05656c3 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/SupportsSavepointsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/SupportsSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Postgresql;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/TableExistsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/TableExistsCest.php
index dcad050c2a8..b53f972f5e9 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/TableExistsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/TableExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/TableOptionsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/TableOptionsCest.php
index d6bfb04b6fd..cdef2634ef1 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/TableOptionsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/TableOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/TruncateTableCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/TruncateTableCest.php
index 3aa662f6e1d..1a3daeb6d3a 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/TruncateTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/TruncateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Postgresql/ViewExistsCest.php b/tests/tocheck-database/Db/Dialect/Postgresql/ViewExistsCest.php
index 264f47e81ff..ddbbcfd6e94 100644
--- a/tests/tocheck-database/Db/Dialect/Postgresql/ViewExistsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Postgresql/ViewExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Postgresql;
+namespace Phalcon\Tests\Integration\Db\Dialect\Postgresql;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/AddColumnCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/AddColumnCest.php
index 7567bb2afc1..58c3b821ce3 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/AddColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/AddColumnCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddColumnCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/AddForeignKeyCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/AddForeignKeyCest.php
index da88edc47d5..455c2da487e 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/AddForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/AddForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/AddIndexCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/AddIndexCest.php
index 125c0485e2e..4437f6c097a 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/AddIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/AddIndexCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class AddIndexCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/AddPrimaryKeyCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/AddPrimaryKeyCest.php
index f69dbf31ac7..e705bc2d7d7 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/AddPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/AddPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/CreateSavepointCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/CreateSavepointCest.php
index 4c10481063e..f09699f572a 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/CreateSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/CreateSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/CreateTableCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/CreateTableCest.php
index 90c5213a4b1..28db117ff9e 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/CreateTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/CreateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/CreateViewCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/CreateViewCest.php
index dda501d7d6b..c84986d9e96 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/CreateViewCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/CreateViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeColumnsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeColumnsCest.php
index c8d9dcf68d7..ba7984fbaf0 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeColumnsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexCest.php
index 8ba408cf071..91ef3b04863 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexesCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexesCest.php
index 3c7df7f82f8..6e4488921ee 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeIndexesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeReferencesCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeReferencesCest.php
index 27cce0dfdd7..dd92296a8c5 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DescribeReferencesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DescribeReferencesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DropColumnCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DropColumnCest.php
index 6ec792ba766..149e57593c5 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DropColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DropColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DropForeignKeyCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DropForeignKeyCest.php
index 55f024671f8..4a5f6d5735c 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DropForeignKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DropForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DropIndexCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DropIndexCest.php
index e92378bcfa6..581f33aed7f 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DropIndexCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DropIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DropPrimaryKeyCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DropPrimaryKeyCest.php
index 06c3e70be36..b1419d2e1c8 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DropPrimaryKeyCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DropPrimaryKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DropTableCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DropTableCest.php
index b68157b08b5..fa8c0904f73 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DropTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DropTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/DropViewCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/DropViewCest.php
index 07dbf837837..13a1bc4c521 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/DropViewCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/DropViewCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/EscapeCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/EscapeCest.php
index f72e52e26d4..8d34e72a50d 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/EscapeCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/EscapeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/EscapeSchemaCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/EscapeSchemaCest.php
index 2394b4414d7..d9f81f9031a 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/EscapeSchemaCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/EscapeSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ForUpdateCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ForUpdateCest.php
index 30d560ff59f..d38c535af71 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ForUpdateCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnDefinitionCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnDefinitionCest.php
index 257f883ea73..9ac9804a7f7 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnDefinitionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnDefinitionCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetColumnDefinitionCest
 {
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnListCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnListCest.php
index 69c2bc3c930..b99c3e85d87 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnListCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/GetColumnListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/GetCustomFunctionsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/GetCustomFunctionsCest.php
index 146150f4748..2e99624f069 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/GetCustomFunctionsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/GetCustomFunctionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlColumnCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlColumnCest.php
index c2d7ac018e1..acec5d066eb 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlExpressionCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlExpressionCest.php
index 4ffbf85d819..78b2863a8ef 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlExpressionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlExpressionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlTableCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlTableCest.php
index ec4eca8f2bc..f393bb2dbb9 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/GetSqlTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/LimitCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/LimitCest.php
index 04b7042daa2..35897231773 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/LimitCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/LimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ListIndexesSqlCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ListIndexesSqlCest.php
index 7eb160d4299..b33a72db50e 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ListIndexesSqlCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ListIndexesSqlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ListTablesCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ListTablesCest.php
index 115f72ac091..b88d690161d 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ListTablesCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ListTablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ListViewsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ListViewsCest.php
index 951d1be2c84..b3b8fae4958 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ListViewsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ListViewsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ModifyColumnCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ModifyColumnCest.php
index f6468d69d7a..32a81d533b8 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ModifyColumnCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ModifyColumnCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/RegisterCustomFunctionCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/RegisterCustomFunctionCest.php
index 3d800dbce49..ed361ecfa4c 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/RegisterCustomFunctionCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/RegisterCustomFunctionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ReleaseSavepointCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ReleaseSavepointCest.php
index f0029706b33..cfe369ca6f4 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ReleaseSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ReleaseSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/RollbackSavepointCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/RollbackSavepointCest.php
index e51c1f1be6b..638d67ab175 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/RollbackSavepointCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/RollbackSavepointCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/SelectCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/SelectCest.php
index 0b630723751..b245c918821 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/SelectCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/SelectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/SharedLockCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/SharedLockCest.php
index efed88c421b..8a5fa3b376f 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/SharedLockCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/SharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/SupportsReleaseSavepointsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/SupportsReleaseSavepointsCest.php
index 25c8ec60c94..5abe88500e5 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/SupportsReleaseSavepointsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/SupportsReleaseSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/SupportsSavepointsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/SupportsSavepointsCest.php
index 08bcac1086e..9d8e1e95454 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/SupportsSavepointsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/SupportsSavepointsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 use Phalcon\Db\Dialect\Sqlite;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/TableExistsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/TableExistsCest.php
index 506fe0a946e..80a8a8312d8 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/TableExistsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/TableExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/TableOptionsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/TableOptionsCest.php
index 1aa4f5de20d..430a1d4c66b 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/TableOptionsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/TableOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/TruncateTableCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/TruncateTableCest.php
index 1938dcf8bce..edb858505f8 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/TruncateTableCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/TruncateTableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Dialect/Sqlite/ViewExistsCest.php b/tests/tocheck-database/Db/Dialect/Sqlite/ViewExistsCest.php
index 50b380a6e2f..eeb3622f24d 100644
--- a/tests/tocheck-database/Db/Dialect/Sqlite/ViewExistsCest.php
+++ b/tests/tocheck-database/Db/Dialect/Sqlite/ViewExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Dialect\Sqlite;
+namespace Phalcon\Tests\Integration\Db\Dialect\Sqlite;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/tocheck-database/Db/Index/ConstructCest.php b/tests/tocheck-database/Db/Index/ConstructCest.php
index abbda8fa911..33570526117 100644
--- a/tests/tocheck-database/Db/Index/ConstructCest.php
+++ b/tests/tocheck-database/Db/Index/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Index;
+namespace Phalcon\Tests\Integration\Db\Index;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Index/GetColumnsCest.php b/tests/tocheck-database/Db/Index/GetColumnsCest.php
index d17aa06bb60..835bb84c989 100644
--- a/tests/tocheck-database/Db/Index/GetColumnsCest.php
+++ b/tests/tocheck-database/Db/Index/GetColumnsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Index;
+namespace Phalcon\Tests\Integration\Db\Index;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetColumnsCest
 {
diff --git a/tests/tocheck-database/Db/Index/GetNameCest.php b/tests/tocheck-database/Db/Index/GetNameCest.php
index 4adc96ea60b..f679fcdf6b5 100644
--- a/tests/tocheck-database/Db/Index/GetNameCest.php
+++ b/tests/tocheck-database/Db/Index/GetNameCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Index;
+namespace Phalcon\Tests\Integration\Db\Index;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetNameCest
 {
diff --git a/tests/tocheck-database/Db/Index/GetTypeCest.php b/tests/tocheck-database/Db/Index/GetTypeCest.php
index a2a181d2c3e..4a2befda55e 100644
--- a/tests/tocheck-database/Db/Index/GetTypeCest.php
+++ b/tests/tocheck-database/Db/Index/GetTypeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Index;
+namespace Phalcon\Tests\Integration\Db\Index;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetTypeCest
 {
diff --git a/tests/tocheck-database/Db/Profiler/GetLastProfileCest.php b/tests/tocheck-database/Db/Profiler/GetLastProfileCest.php
index 79ce4ce4d6d..e534d80de96 100644
--- a/tests/tocheck-database/Db/Profiler/GetLastProfileCest.php
+++ b/tests/tocheck-database/Db/Profiler/GetLastProfileCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Db\Profiler\Item;
 use Phalcon\Events\Manager;
-use Phalcon\Test\Fixtures\Db\ProfilerListener;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Db\ProfilerListener;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use function is_double;
 
 class GetLastProfileCest
diff --git a/tests/tocheck-database/Db/Profiler/GetNumberTotalStatementsCest.php b/tests/tocheck-database/Db/Profiler/GetNumberTotalStatementsCest.php
index 7df38440420..97748fbf603 100644
--- a/tests/tocheck-database/Db/Profiler/GetNumberTotalStatementsCest.php
+++ b/tests/tocheck-database/Db/Profiler/GetNumberTotalStatementsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Events\Manager;
-use Phalcon\Test\Fixtures\Db\ProfilerListener;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Db\ProfilerListener;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetNumberTotalStatementsCest
 {
diff --git a/tests/tocheck-database/Db/Profiler/GetProfilesCest.php b/tests/tocheck-database/Db/Profiler/GetProfilesCest.php
index 875982edc6a..e4c14fd9812 100644
--- a/tests/tocheck-database/Db/Profiler/GetProfilesCest.php
+++ b/tests/tocheck-database/Db/Profiler/GetProfilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Profiler/GetTotalElapsedSecondsCest.php b/tests/tocheck-database/Db/Profiler/GetTotalElapsedSecondsCest.php
index d22a12c3cf7..b1a645c89d1 100644
--- a/tests/tocheck-database/Db/Profiler/GetTotalElapsedSecondsCest.php
+++ b/tests/tocheck-database/Db/Profiler/GetTotalElapsedSecondsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Profiler/ResetCest.php b/tests/tocheck-database/Db/Profiler/ResetCest.php
index 68faeb5c33e..2eb53e40777 100644
--- a/tests/tocheck-database/Db/Profiler/ResetCest.php
+++ b/tests/tocheck-database/Db/Profiler/ResetCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Events\Manager;
-use Phalcon\Test\Fixtures\Db\ProfilerListener;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Db\ProfilerListener;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use function is_double;
 
 class ResetCest
diff --git a/tests/tocheck-database/Db/Profiler/StartProfileCest.php b/tests/tocheck-database/Db/Profiler/StartProfileCest.php
index 1abd1de7c2f..f92785ed542 100644
--- a/tests/tocheck-database/Db/Profiler/StartProfileCest.php
+++ b/tests/tocheck-database/Db/Profiler/StartProfileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Profiler/StopProfileCest.php b/tests/tocheck-database/Db/Profiler/StopProfileCest.php
index 3c995649443..d07f165369b 100644
--- a/tests/tocheck-database/Db/Profiler/StopProfileCest.php
+++ b/tests/tocheck-database/Db/Profiler/StopProfileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Profiler;
+namespace Phalcon\Tests\Integration\Db\Profiler;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Reference/ConstructCest.php b/tests/tocheck-database/Db/Reference/ConstructCest.php
index cca20c21669..ce5d66caa02 100644
--- a/tests/tocheck-database/Db/Reference/ConstructCest.php
+++ b/tests/tocheck-database/Db/Reference/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Reference/GetColumnsCest.php b/tests/tocheck-database/Db/Reference/GetColumnsCest.php
index bcb1c254441..20ff95c9f1d 100644
--- a/tests/tocheck-database/Db/Reference/GetColumnsCest.php
+++ b/tests/tocheck-database/Db/Reference/GetColumnsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetColumnsCest
 {
diff --git a/tests/tocheck-database/Db/Reference/GetNameCest.php b/tests/tocheck-database/Db/Reference/GetNameCest.php
index 426b5b3e2e6..1b454a52746 100644
--- a/tests/tocheck-database/Db/Reference/GetNameCest.php
+++ b/tests/tocheck-database/Db/Reference/GetNameCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetNameCest
 {
diff --git a/tests/tocheck-database/Db/Reference/GetOnDeleteCest.php b/tests/tocheck-database/Db/Reference/GetOnDeleteCest.php
index fe482fb97b2..1b88ad63dbe 100644
--- a/tests/tocheck-database/Db/Reference/GetOnDeleteCest.php
+++ b/tests/tocheck-database/Db/Reference/GetOnDeleteCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetOnDeleteCest
 {
diff --git a/tests/tocheck-database/Db/Reference/GetOnUpdateCest.php b/tests/tocheck-database/Db/Reference/GetOnUpdateCest.php
index 6485236d9bf..be57608a7f3 100644
--- a/tests/tocheck-database/Db/Reference/GetOnUpdateCest.php
+++ b/tests/tocheck-database/Db/Reference/GetOnUpdateCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetOnUpdateCest
 {
diff --git a/tests/tocheck-database/Db/Reference/GetReferencedColumnsCest.php b/tests/tocheck-database/Db/Reference/GetReferencedColumnsCest.php
index 705bcd7ed95..bf2a54db9ba 100644
--- a/tests/tocheck-database/Db/Reference/GetReferencedColumnsCest.php
+++ b/tests/tocheck-database/Db/Reference/GetReferencedColumnsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetReferencedColumnsCest
 {
diff --git a/tests/tocheck-database/Db/Reference/GetReferencedSchemaCest.php b/tests/tocheck-database/Db/Reference/GetReferencedSchemaCest.php
index 0127b77a70d..2ead626033d 100644
--- a/tests/tocheck-database/Db/Reference/GetReferencedSchemaCest.php
+++ b/tests/tocheck-database/Db/Reference/GetReferencedSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Reference/GetReferencedTableCest.php b/tests/tocheck-database/Db/Reference/GetReferencedTableCest.php
index d6ebbbf67b4..f77036eea0c 100644
--- a/tests/tocheck-database/Db/Reference/GetReferencedTableCest.php
+++ b/tests/tocheck-database/Db/Reference/GetReferencedTableCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DialectTrait;
+use Phalcon\Tests\Fixtures\Traits\DialectTrait;
 
 class GetReferencedTableCest
 {
diff --git a/tests/tocheck-database/Db/Reference/GetSchemaNameCest.php b/tests/tocheck-database/Db/Reference/GetSchemaNameCest.php
index 8e22030a728..48160e6049b 100644
--- a/tests/tocheck-database/Db/Reference/GetSchemaNameCest.php
+++ b/tests/tocheck-database/Db/Reference/GetSchemaNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Reference;
+namespace Phalcon\Tests\Integration\Db\Reference;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/ConstructCest.php b/tests/tocheck-database/Db/Result/Pdo/ConstructCest.php
index 9f8ea1f0e89..2e730cad975 100644
--- a/tests/tocheck-database/Db/Result/Pdo/ConstructCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/DataSeekCest.php b/tests/tocheck-database/Db/Result/Pdo/DataSeekCest.php
index b34343e313f..e6779043ae6 100644
--- a/tests/tocheck-database/Db/Result/Pdo/DataSeekCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/DataSeekCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/ExecuteCest.php b/tests/tocheck-database/Db/Result/Pdo/ExecuteCest.php
index 1f910ec9094..9ed1e3ed5c8 100644
--- a/tests/tocheck-database/Db/Result/Pdo/ExecuteCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/ExecuteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/FetchAllCest.php b/tests/tocheck-database/Db/Result/Pdo/FetchAllCest.php
index 11fa358a25e..be816b961e4 100644
--- a/tests/tocheck-database/Db/Result/Pdo/FetchAllCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/FetchAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/FetchArrayCest.php b/tests/tocheck-database/Db/Result/Pdo/FetchArrayCest.php
index 1d981efada0..77dcab82e3d 100644
--- a/tests/tocheck-database/Db/Result/Pdo/FetchArrayCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/FetchArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/FetchCest.php b/tests/tocheck-database/Db/Result/Pdo/FetchCest.php
index b4f8644f003..15fd7d2dbdf 100644
--- a/tests/tocheck-database/Db/Result/Pdo/FetchCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/FetchCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/GetInternalResultCest.php b/tests/tocheck-database/Db/Result/Pdo/GetInternalResultCest.php
index 241bcdb7601..3c89940222f 100644
--- a/tests/tocheck-database/Db/Result/Pdo/GetInternalResultCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/GetInternalResultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/NumRowsCest.php b/tests/tocheck-database/Db/Result/Pdo/NumRowsCest.php
index 385d8bae3b1..6e31050ee15 100644
--- a/tests/tocheck-database/Db/Result/Pdo/NumRowsCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/NumRowsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/Result/Pdo/SetFetchModeCest.php b/tests/tocheck-database/Db/Result/Pdo/SetFetchModeCest.php
index 3ced4c6c6e4..583692c6c46 100644
--- a/tests/tocheck-database/Db/Result/Pdo/SetFetchModeCest.php
+++ b/tests/tocheck-database/Db/Result/Pdo/SetFetchModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db\Result\Pdo;
+namespace Phalcon\Tests\Integration\Db\Result\Pdo;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Db/SetupCest.php b/tests/tocheck-database/Db/SetupCest.php
index 931d0e32d1c..1413d0265bb 100644
--- a/tests/tocheck-database/Db/SetupCest.php
+++ b/tests/tocheck-database/Db/SetupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Db;
+namespace Phalcon\Tests\Integration\Db;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Forms/Form/ClearCest.php b/tests/tocheck-database/Forms/Form/ClearCest.php
index 91c782695a9..cf054fb74c0 100644
--- a/tests/tocheck-database/Forms/Form/ClearCest.php
+++ b/tests/tocheck-database/Forms/Form/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Forms\Form;
+namespace Phalcon\Tests\Integration\Forms\Form;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Email;
@@ -21,7 +21,7 @@
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
-use Phalcon\Test\Models\Select as MvcModel;
+use Phalcon\Tests\Models\Select as MvcModel;
 use Phalcon\Validation\Validator\PresenceOf;
 use Phalcon\Validation\Validator\StringLength;
 use Phalcon\Validation\Validator\StringLength\Min;
diff --git a/tests/tocheck-database/Forms/FormCest.php b/tests/tocheck-database/Forms/FormCest.php
index fcabed28090..a4291d9e865 100644
--- a/tests/tocheck-database/Forms/FormCest.php
+++ b/tests/tocheck-database/Forms/FormCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Forms;
+namespace Phalcon\Tests\Integration\Forms;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
@@ -17,7 +17,7 @@
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Validation\Validator\PresenceOf;
 use Phalcon\Validation\Validator\Regex;
 use Phalcon\Validation\Validator\StringLength;
diff --git a/tests/tocheck-database/Forms/FormElementsCest.php b/tests/tocheck-database/Forms/FormElementsCest.php
index b4034c7ab2f..d0d8965c429 100644
--- a/tests/tocheck-database/Forms/FormElementsCest.php
+++ b/tests/tocheck-database/Forms/FormElementsCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Integration\Forms;
+namespace Phalcon\Tests\Integration\Forms;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\StringLength;
 
 /**
- * Phalcon\Test\Integration\Forms\FormCest
+ * Phalcon\Tests\Integration\Forms\FormCest
  * Tests the \Phalcon\Forms\Form component
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/tocheck-database/Forms/FormsCest.php b/tests/tocheck-database/Forms/FormsCest.php
index 90fe5c79bd8..8db1a06a6d0 100644
--- a/tests/tocheck-database/Forms/FormsCest.php
+++ b/tests/tocheck-database/Forms/FormsCest.php
@@ -18,7 +18,7 @@
     +------------------------------------------------------------------------+
 */
 
-namespace Phalcon\Test\Integration\Forms;
+namespace Phalcon\Tests\Integration\Forms;
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Radio;
@@ -27,9 +27,9 @@
 use Phalcon\Forms\Form;
 use Phalcon\Messages\Message;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Forms\ContactFormPublicProperties;
-use Phalcon\Test\Fixtures\Forms\ContactFormSettersGetters;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Forms\ContactFormPublicProperties;
+use Phalcon\Tests\Fixtures\Forms\ContactFormSettersGetters;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Validation\Validator\PresenceOf;
 
 class FormsCest
diff --git a/tests/tocheck-database/Mvc/Application/RegisterModulesCest.php b/tests/tocheck-database/Mvc/Application/RegisterModulesCest.php
index 7d61a0938d4..aa9c536c064 100644
--- a/tests/tocheck-database/Mvc/Application/RegisterModulesCest.php
+++ b/tests/tocheck-database/Mvc/Application/RegisterModulesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Application;
+namespace Phalcon\Tests\Integration\Mvc\Application;
 
 use IntegrationTester;
 use Phalcon\Di;
@@ -20,7 +20,7 @@
 use Phalcon\Mvc\Application;
 use Phalcon\Mvc\Router;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Modules\Backend\Module;
+use Phalcon\Tests\Modules\Backend\Module;
 
 class RegisterModulesCest
 {
@@ -44,7 +44,7 @@ function () {
                     [
                         'controller' => 'index',
                         'module'     => 'frontend',
-                        'namespace'  => 'Phalcon\Test\Modules\Frontend\Controllers',
+                        'namespace'  => 'Phalcon\Tests\Modules\Frontend\Controllers',
                     ]
                 );
 
@@ -58,7 +58,7 @@ function () {
             [
                 'frontend' => [
                     'path'      => dataDir('fixtures/modules/frontend/Module.php'),
-                    'className' => \Phalcon\Test\Modules\Frontend\Module::class,
+                    'className' => \Phalcon\Tests\Modules\Frontend\Module::class,
                 ],
                 'backend'  => [
                     'path'      => dataDir('fixtures/modules/backend/Module.php'),
@@ -97,7 +97,7 @@ function () {
                     [
                         'controller' => 'index',
                         'module'     => 'frontend',
-                        'namespace'  => 'Phalcon\Test\Modules\Frontend\Controllers',
+                        'namespace'  => 'Phalcon\Tests\Modules\Frontend\Controllers',
                     ]
                 );
 
@@ -106,7 +106,7 @@ function () {
                     [
                         'controller' => 'login',
                         'module'     => 'backend',
-                        'namespace'  => 'Phalcon\Test\Modules\Backend\Controllers',
+                        'namespace'  => 'Phalcon\Tests\Modules\Backend\Controllers',
                     ]
                 );
 
@@ -181,7 +181,7 @@ function () {
                     [
                         'controller' => 'index',
                         'module'     => 'frontend',
-                        'namespace'  => 'Phalcon\Test\Modules\Frontend\Controllers',
+                        'namespace'  => 'Phalcon\Tests\Modules\Frontend\Controllers',
                     ]
                 );
 
@@ -195,7 +195,7 @@ function () {
             [
                 'frontend' => [
                     'path'      => dataDir('not-a-real-file.php'),
-                    'className' => \Phalcon\Test\Modules\Frontend\Module::class,
+                    'className' => \Phalcon\Tests\Modules\Frontend\Module::class,
                 ],
             ]
         );
diff --git a/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php b/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php
index 4e16a2d94e4..99fdc2f18c9 100644
--- a/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php
+++ b/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model;
diff --git a/tests/tocheck-database/Mvc/Model/AppendMessageCest.php b/tests/tocheck-database/Mvc/Model/AppendMessageCest.php
index 34b9006cde6..481d131220f 100644
--- a/tests/tocheck-database/Mvc/Model/AppendMessageCest.php
+++ b/tests/tocheck-database/Mvc/Model/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/ConstructCest.php
index 8ca7f7c1a43..56aa1f0d96e 100644
--- a/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Behavior\SoftDelete;
+namespace Phalcon\Tests\Integration\Mvc\Model\Behavior\SoftDelete;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/MissingMethodCest.php b/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/MissingMethodCest.php
index 39ff5120799..e8a92842f93 100644
--- a/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/MissingMethodCest.php
+++ b/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/MissingMethodCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Behavior\SoftDelete;
+namespace Phalcon\Tests\Integration\Mvc\Model\Behavior\SoftDelete;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Users;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Users;
 
 class MissingMethodCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/NotifyCest.php b/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/NotifyCest.php
index d1581930418..71392b9adf3 100644
--- a/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/NotifyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Behavior/SoftDelete/NotifyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Behavior\SoftDelete;
+namespace Phalcon\Tests\Integration\Mvc\Model\Behavior\SoftDelete;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/ConstructCest.php
index 2ac6718a522..930971e49de 100644
--- a/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Behavior\Timestampable;
+namespace Phalcon\Tests\Integration\Mvc\Model\Behavior\Timestampable;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/MissingMethodCest.php b/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/MissingMethodCest.php
index 336f6d037cc..ddf1e14abda 100644
--- a/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/MissingMethodCest.php
+++ b/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/MissingMethodCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Behavior\Timestampable;
+namespace Phalcon\Tests\Integration\Mvc\Model\Behavior\Timestampable;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Behavior\Timestampable;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Users;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Users;
 
 class MissingMethodCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/NotifyCest.php b/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/NotifyCest.php
index 08c74cd784e..72566e30f7b 100644
--- a/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/NotifyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Behavior/Timestampable/NotifyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Behavior\Timestampable;
+namespace Phalcon\Tests\Integration\Mvc\Model\Behavior\Timestampable;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Binder/BindToHandlerCest.php b/tests/tocheck-database/Mvc/Model/Binder/BindToHandlerCest.php
index 54108a06a6f..b659be376d6 100644
--- a/tests/tocheck-database/Mvc/Model/Binder/BindToHandlerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Binder/BindToHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Binder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Binder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Binder/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Binder/ConstructCest.php
index ac19d90818d..7a2152afafd 100644
--- a/tests/tocheck-database/Mvc/Model/Binder/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Binder/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Binder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Binder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Binder/GetBoundModelsCest.php b/tests/tocheck-database/Mvc/Model/Binder/GetBoundModelsCest.php
index 3f38aaa8b07..c520a5c13b2 100644
--- a/tests/tocheck-database/Mvc/Model/Binder/GetBoundModelsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Binder/GetBoundModelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Binder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Binder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Binder/GetCacheCest.php b/tests/tocheck-database/Mvc/Model/Binder/GetCacheCest.php
index 543585e1131..f0903a4ed38 100644
--- a/tests/tocheck-database/Mvc/Model/Binder/GetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Binder/GetCacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Binder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Binder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Binder/GetOriginalValuesCest.php b/tests/tocheck-database/Mvc/Model/Binder/GetOriginalValuesCest.php
index 3493bf5f8e7..0d2e35074a6 100644
--- a/tests/tocheck-database/Mvc/Model/Binder/GetOriginalValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Binder/GetOriginalValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Binder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Binder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Binder/SetCacheCest.php b/tests/tocheck-database/Mvc/Model/Binder/SetCacheCest.php
index 8bf4f19e8de..ad1a9637b92 100644
--- a/tests/tocheck-database/Mvc/Model/Binder/SetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Binder/SetCacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Binder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Binder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/CloneResultCest.php b/tests/tocheck-database/Mvc/Model/CloneResultCest.php
index 4c141c9260c..0b5ca6e1740 100644
--- a/tests/tocheck-database/Mvc/Model/CloneResultCest.php
+++ b/tests/tocheck-database/Mvc/Model/CloneResultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/CloneResultMapCest.php b/tests/tocheck-database/Mvc/Model/CloneResultMapCest.php
index e41d7610b62..02b0e38dbf3 100644
--- a/tests/tocheck-database/Mvc/Model/CloneResultMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/CloneResultMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/CloneResultMapHydrateCest.php b/tests/tocheck-database/Mvc/Model/CloneResultMapHydrateCest.php
index 56e50984e2d..01f623db941 100644
--- a/tests/tocheck-database/Mvc/Model/CloneResultMapHydrateCest.php
+++ b/tests/tocheck-database/Mvc/Model/CloneResultMapHydrateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/DumpCest.php b/tests/tocheck-database/Mvc/Model/DumpCest.php
index 74d7485a36c..67e957fddc8 100644
--- a/tests/tocheck-database/Mvc/Model/DumpCest.php
+++ b/tests/tocheck-database/Mvc/Model/DumpCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/FireEventCancelCest.php b/tests/tocheck-database/Mvc/Model/FireEventCancelCest.php
index 50a989d0b28..6faf2e4173e 100644
--- a/tests/tocheck-database/Mvc/Model/FireEventCancelCest.php
+++ b/tests/tocheck-database/Mvc/Model/FireEventCancelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/FireEventCest.php b/tests/tocheck-database/Mvc/Model/FireEventCest.php
index 408de60f6ce..b695793034a 100644
--- a/tests/tocheck-database/Mvc/Model/FireEventCest.php
+++ b/tests/tocheck-database/Mvc/Model/FireEventCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetChangedFieldsCest.php b/tests/tocheck-database/Mvc/Model/GetChangedFieldsCest.php
index c26d5f39681..e997d3d6797 100644
--- a/tests/tocheck-database/Mvc/Model/GetChangedFieldsCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetChangedFieldsCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 /**
  * Class GetChangedFieldsCest
diff --git a/tests/tocheck-database/Mvc/Model/GetDirtyStateCest.php b/tests/tocheck-database/Mvc/Model/GetDirtyStateCest.php
index 09433c9258f..e68ab4f1e21 100644
--- a/tests/tocheck-database/Mvc/Model/GetDirtyStateCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetDirtyStateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetModelsManagerCest.php b/tests/tocheck-database/Mvc/Model/GetModelsManagerCest.php
index f81594dd212..4a602a03117 100644
--- a/tests/tocheck-database/Mvc/Model/GetModelsManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetModelsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetModelsMetaDataCest.php b/tests/tocheck-database/Mvc/Model/GetModelsMetaDataCest.php
index d1eaaa8a015..e703b3f73bf 100644
--- a/tests/tocheck-database/Mvc/Model/GetModelsMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetModelsMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetOldSnapshotDataCest.php b/tests/tocheck-database/Mvc/Model/GetOldSnapshotDataCest.php
index f8d67558f00..c7ba23896c6 100644
--- a/tests/tocheck-database/Mvc/Model/GetOldSnapshotDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetOldSnapshotDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetOperationMadeCest.php b/tests/tocheck-database/Mvc/Model/GetOperationMadeCest.php
index aae20f28f1f..5bcc954c590 100644
--- a/tests/tocheck-database/Mvc/Model/GetOperationMadeCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetOperationMadeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetRelatedCest.php b/tests/tocheck-database/Mvc/Model/GetRelatedCest.php
index fe8f28d7874..b7bd14ce314 100644
--- a/tests/tocheck-database/Mvc/Model/GetRelatedCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetRelatedCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models;
 
 class GetRelatedCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/GetSchemaCest.php b/tests/tocheck-database/Mvc/Model/GetSchemaCest.php
index 2941d634c11..2215e95cee8 100644
--- a/tests/tocheck-database/Mvc/Model/GetSchemaCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetSnapshotDataCest.php b/tests/tocheck-database/Mvc/Model/GetSnapshotDataCest.php
index 53668833b2b..24a492216e8 100644
--- a/tests/tocheck-database/Mvc/Model/GetSnapshotDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetSnapshotDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetSourceCest.php b/tests/tocheck-database/Mvc/Model/GetSourceCest.php
index 58e75b0aedc..fa4451c985b 100644
--- a/tests/tocheck-database/Mvc/Model/GetSourceCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetSourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetTransactionCest.php b/tests/tocheck-database/Mvc/Model/GetTransactionCest.php
index 33889092b92..ce41d5b8318 100644
--- a/tests/tocheck-database/Mvc/Model/GetTransactionCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/GetUpdatedFieldsCest.php b/tests/tocheck-database/Mvc/Model/GetUpdatedFieldsCest.php
index de0fef06056..1d7206efa7e 100644
--- a/tests/tocheck-database/Mvc/Model/GetUpdatedFieldsCest.php
+++ b/tests/tocheck-database/Mvc/Model/GetUpdatedFieldsCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 /**
  * Class GetUpdatedFieldsCest
diff --git a/tests/tocheck-database/Mvc/Model/HasSnapshotDataCest.php b/tests/tocheck-database/Mvc/Model/HasSnapshotDataCest.php
index 5a8f03f885c..045b3908ec6 100644
--- a/tests/tocheck-database/Mvc/Model/HasSnapshotDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/HasSnapshotDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/HasUpdatedCest.php b/tests/tocheck-database/Mvc/Model/HasUpdatedCest.php
index 72e2e187561..f6eb424b480 100644
--- a/tests/tocheck-database/Mvc/Model/HasUpdatedCest.php
+++ b/tests/tocheck-database/Mvc/Model/HasUpdatedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/InvokeFinderCest.php b/tests/tocheck-database/Mvc/Model/InvokeFinderCest.php
index 190c908975f..e58bb96e304 100644
--- a/tests/tocheck-database/Mvc/Model/InvokeFinderCest.php
+++ b/tests/tocheck-database/Mvc/Model/InvokeFinderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Migrations\ObjectsMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Objects;
+use Phalcon\Tests\Fixtures\Migrations\ObjectsMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Objects;
 
 /**
  * Class InvokeFinderCest
diff --git a/tests/tocheck-database/Mvc/Model/IsRelationshipLoadedCest.php b/tests/tocheck-database/Mvc/Model/IsRelationshipLoadedCest.php
index 46f79ceff0f..9cf72644f6b 100644
--- a/tests/tocheck-database/Mvc/Model/IsRelationshipLoadedCest.php
+++ b/tests/tocheck-database/Mvc/Model/IsRelationshipLoadedCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\AlbumORama;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\AlbumORama;
 
 class IsRelationshipLoadedCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/JsonSerializeCest.php b/tests/tocheck-database/Mvc/Model/JsonSerializeCest.php
index 5b08693aba2..53a1d3cea59 100644
--- a/tests/tocheck-database/Mvc/Model/JsonSerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/AddBehaviorCest.php b/tests/tocheck-database/Mvc/Model/Manager/AddBehaviorCest.php
index bf894522cb9..2023feaaf6b 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/AddBehaviorCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/AddBehaviorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/AddBelongsToCest.php b/tests/tocheck-database/Mvc/Model/Manager/AddBelongsToCest.php
index 143f98940d2..a0937c00ad1 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/AddBelongsToCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/AddBelongsToCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/AddHasManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/AddHasManyCest.php
index 99de0120fd8..86fb50da854 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/AddHasManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/AddHasManyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/AddHasManyToManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/AddHasManyToManyCest.php
index 15410d1780e..37e526ba4a4 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/AddHasManyToManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/AddHasManyToManyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/AddHasOneCest.php b/tests/tocheck-database/Mvc/Model/Manager/AddHasOneCest.php
index 56c4b79ab5c..70ebe2cceed 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/AddHasOneCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/AddHasOneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/AddHasOneThroughCest.php b/tests/tocheck-database/Mvc/Model/Manager/AddHasOneThroughCest.php
index 7230231fb47..62e6197e8de 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/AddHasOneThroughCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/AddHasOneThroughCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/ClearReusableObjectsCest.php b/tests/tocheck-database/Mvc/Model/Manager/ClearReusableObjectsCest.php
index 91a0db738f9..147d61dc6ee 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/ClearReusableObjectsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/ClearReusableObjectsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/CreateBuilderCest.php b/tests/tocheck-database/Mvc/Model/Manager/CreateBuilderCest.php
index 33c5bdd6ab6..6ba1a7dd97b 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/CreateBuilderCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/CreateBuilderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/CreateQueryCest.php b/tests/tocheck-database/Mvc/Model/Manager/CreateQueryCest.php
index 510d2988930..ba70554c0df 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/CreateQueryCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/CreateQueryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/DestructCest.php b/tests/tocheck-database/Mvc/Model/Manager/DestructCest.php
index 0f2c1d9d89c..5cf5ced58ba 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/DestructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/DestructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/ExistsBelongsToCest.php b/tests/tocheck-database/Mvc/Model/Manager/ExistsBelongsToCest.php
index 1b1c5e51794..bb40be5638a 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/ExistsBelongsToCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/ExistsBelongsToCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Relations\RelationsParts;
-use Phalcon\Test\Models\Relations\RelationsRobots;
-use Phalcon\Test\Models\Relations\RelationsRobotsParts;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Relations\RelationsParts;
+use Phalcon\Tests\Models\Relations\RelationsRobots;
+use Phalcon\Tests\Models\Relations\RelationsRobotsParts;
 
 class ExistsBelongsToCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyCest.php
index 202a3121b3d..cde12e3f83d 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Relations\RelationsParts;
-use Phalcon\Test\Models\Relations\RelationsRobots;
-use Phalcon\Test\Models\Relations\RelationsRobotsParts;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Relations\RelationsParts;
+use Phalcon\Tests\Models\Relations\RelationsRobots;
+use Phalcon\Tests\Models\Relations\RelationsRobotsParts;
 
 class ExistsHasManyCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyToManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyToManyCest.php
index e5bff07ffbb..689cbea1c4a 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyToManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasManyToManyCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Relations\RelationsParts;
-use Phalcon\Test\Models\Relations\RelationsRobots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Relations\RelationsParts;
+use Phalcon\Tests\Models\Relations\RelationsRobots;
 
 class ExistsHasManyToManyCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneCest.php b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneCest.php
index 99fcf2ff964..c88ecb25115 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneThroughCest.php b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneThroughCest.php
index a959f4b7ebc..6de9e2b6fe8 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneThroughCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/ExistsHasOneThroughCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Relations\RelationsParts;
-use Phalcon\Test\Models\Relations\RelationsRobots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Relations\RelationsParts;
+use Phalcon\Tests\Models\Relations\RelationsRobots;
 
 class ExistsHasOneThroughCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToCest.php
index 4382c079409..aaef2401d79 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToRecordsCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToRecordsCest.php
index c4b8d45f50b..5bea80a12ae 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToRecordsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetBelongsToRecordsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetCustomEventsManagerCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetCustomEventsManagerCest.php
index af8aa08ed8b..d77e3488cfc 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetCustomEventsManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetCustomEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetDICest.php b/tests/tocheck-database/Mvc/Model/Manager/GetDICest.php
index f2e14683f50..95bf2e55010 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetEventsManagerCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetEventsManagerCest.php
index fa2ab63f502..7306827c612 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetEventsManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasManyCest.php
index 1423023ad0f..79f1b771793 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasManyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasManyRecordsCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasManyRecordsCest.php
index e2d78540d4f..a63b6596768 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasManyRecordsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasManyRecordsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasManyToManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasManyToManyCest.php
index a3cded908bd..4b6e23c7e5a 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasManyToManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasManyToManyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneAndHasManyCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneAndHasManyCest.php
index b4207b40e65..eff187991cb 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneAndHasManyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneAndHasManyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneCest.php
index 102bab53e6c..d3f06371527 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneRecordsCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneRecordsCest.php
index 9962bcf915a..f49521974e3 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneRecordsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneRecordsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneThroughCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneThroughCest.php
index 0ba734a0b8b..9a409c75583 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetHasOneThroughCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetHasOneThroughCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetLastInitializedCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetLastInitializedCest.php
index 5d1682fb983..0a9c9bd83db 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetLastInitializedCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetLastInitializedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetLastQueryCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetLastQueryCest.php
index 7782ec63e35..18505e1b6c7 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetLastQueryCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetLastQueryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetModelPrefixCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetModelPrefixCest.php
index 57f246342b6..690fc7cfe85 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetModelPrefixCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetModelPrefixCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetModelPrefixCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetModelSchemaCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetModelSchemaCest.php
index ba93d2552b1..35de16114d3 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetModelSchemaCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetModelSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetModelSourceCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetModelSourceCest.php
index 8b8a8fb8554..f9f890cf9d1 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetModelSourceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetModelSourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionCest.php
index b1ac2ca99ca..cf1f10792a8 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionServiceCest.php
index c829bc1e924..2287279234c 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetReadConnectionServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetRelationByAliasCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetRelationByAliasCest.php
index 89fc3ad173e..7fd9c45b4f0 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetRelationByAliasCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetRelationByAliasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetRelationRecordsCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetRelationRecordsCest.php
index f9cb4de7758..661a44e61ee 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetRelationRecordsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetRelationRecordsCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Manager;
 use Phalcon\Mvc\Model\Resultset;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\AlbumORama\Albums;
-use Phalcon\Test\Models\AlbumORama\Artists;
-use Phalcon\Test\Models\AlbumORama\Songs;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\AlbumORama\Albums;
+use Phalcon\Tests\Models\AlbumORama\Artists;
+use Phalcon\Tests\Models\AlbumORama\Songs;
 
 class GetRelationRecordsCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetRelationsBetweenCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetRelationsBetweenCest.php
index 15206769b71..2fdbc4e3e44 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetRelationsBetweenCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetRelationsBetweenCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetRelationsCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetRelationsCest.php
index 3370ed79408..b9eaefd7fe9 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetRelationsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetRelationsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetReusableRecordsCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetReusableRecordsCest.php
index 968e8e82d96..f26a76b4b49 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetReusableRecordsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetReusableRecordsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionCest.php
index 084d09fd414..48f8242590f 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionServiceCest.php
index ab9a7cf8d3e..396cc43bb19 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/GetWriteConnectionServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/InitializeCest.php b/tests/tocheck-database/Mvc/Model/Manager/InitializeCest.php
index fef7f5bc55b..cbab5976247 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/InitializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/InitializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/IsInitializedCest.php b/tests/tocheck-database/Mvc/Model/Manager/IsInitializedCest.php
index 35dd2b406a3..18ab744eaff 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/IsInitializedCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/IsInitializedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/IsKeepingSnapshotsCest.php b/tests/tocheck-database/Mvc/Model/Manager/IsKeepingSnapshotsCest.php
index b9b722d3ebe..147d9bcd5fb 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/IsKeepingSnapshotsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/IsKeepingSnapshotsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/IsUsingDynamicUpdateCest.php b/tests/tocheck-database/Mvc/Model/Manager/IsUsingDynamicUpdateCest.php
index 7961b5dd1b8..e1f039fefd1 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/IsUsingDynamicUpdateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/IsUsingDynamicUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/IsVisibleModelPropertyCest.php b/tests/tocheck-database/Mvc/Model/Manager/IsVisibleModelPropertyCest.php
index 438cc16a2c3..3bff2371b32 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/IsVisibleModelPropertyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/IsVisibleModelPropertyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Customers;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Customers;
 
 class IsVisibleModelPropertyCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/KeepSnapshotsCest.php b/tests/tocheck-database/Mvc/Model/Manager/KeepSnapshotsCest.php
index 37b0d44ad1f..3a544bd68f7 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/KeepSnapshotsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/KeepSnapshotsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/LoadCest.php b/tests/tocheck-database/Mvc/Model/Manager/LoadCest.php
index ce95109cd78..182d98c3026 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/LoadCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/LoadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/MissingMethodCest.php b/tests/tocheck-database/Mvc/Model/Manager/MissingMethodCest.php
index e6b0128311d..cde2ce18d61 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/MissingMethodCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/MissingMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/NotifyEventCest.php b/tests/tocheck-database/Mvc/Model/Manager/NotifyEventCest.php
index 5d79ea45884..f9b62a5b176 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/NotifyEventCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/NotifyEventCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetConnectionServiceCest.php
index 11fea0088db..c681169360f 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetConnectionServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetCustomEventsManagerCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetCustomEventsManagerCest.php
index 78544a56ba6..d81cad13ebf 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetCustomEventsManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetCustomEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetDICest.php b/tests/tocheck-database/Mvc/Model/Manager/SetDICest.php
index 9317eedf606..ee04eb832bc 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetEventsManagerCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetEventsManagerCest.php
index 5f452ce18b9..95f52f9c86c 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetEventsManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetModelPrefixCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetModelPrefixCest.php
index 8695414fb5d..36c2300bc93 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetModelPrefixCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetModelPrefixCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 class SetModelPrefixCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetModelSchemaCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetModelSchemaCest.php
index 33de81ae74a..24d24a4dce3 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetModelSchemaCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetModelSchemaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetModelSourceCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetModelSourceCest.php
index b3bf1efc661..2157b6237be 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetModelSourceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetModelSourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetReadConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetReadConnectionServiceCest.php
index b712d8add45..d6472f05f3b 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetReadConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetReadConnectionServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetReusableRecordsCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetReusableRecordsCest.php
index 6b751a493d0..f999160b53a 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetReusableRecordsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetReusableRecordsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/SetWriteConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/Manager/SetWriteConnectionServiceCest.php
index b6f730f8d46..a1a5a12fd98 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/SetWriteConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/SetWriteConnectionServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/UnderscoreGetConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/Manager/UnderscoreGetConnectionServiceCest.php
index 2e9527e4bd2..707b2760a93 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/UnderscoreGetConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/UnderscoreGetConnectionServiceCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Manager/UseDynamicUpdateCest.php b/tests/tocheck-database/Mvc/Model/Manager/UseDynamicUpdateCest.php
index 34513ec0994..34d899135ef 100644
--- a/tests/tocheck-database/Mvc/Model/Manager/UseDynamicUpdateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Manager/UseDynamicUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ConstructCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ConstructCest.php
index 1660f48b5a3..408e7d9eb54 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ConstructCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Mvc\Model\MetaData\Apcu;
 use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function apcu_clear_cache;
 use function apcu_fetch;
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAttributesCest.php
index a4a2c85ac41..228060be924 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticCreateAttributesCest.php
index 400be919c20..c82f736f548 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticUpdateAttributesCest.php
index db9382d6db0..cfbb31f12da 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetBindTypesCest.php
index b15abebdf2d..2a637af7bca 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetColumnMapCest.php
index 471f2614e70..c9b2a6cd446 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesCest.php
index 365f569d247..3a2affbd7ae 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesNumericCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesNumericCest.php
index 04ffea0e59b..c04e32ce299 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesNumericCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDataTypesNumericCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDefaultValuesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDefaultValuesCest.php
index 8b71d86a387..617f15072d8 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDefaultValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetDefaultValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetEmptyStringAttributesCest.php
index 3114f54f0e5..32481fb95c5 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetIdentityFieldCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetIdentityFieldCest.php
index 8450193a4a7..802590b3cfb 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetIdentityFieldCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetIdentityFieldCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNonPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNonPrimaryKeyAttributesCest.php
index 28edaabe617..d6718d32c5f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNonPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNonPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNotNullAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNotNullAttributesCest.php
index 92ade25e510..91f6aef9e22 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNotNullAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetNotNullAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetPrimaryKeyAttributesCest.php
index 5fa71891a8f..2676f392ab4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetReverseColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetReverseColumnMapCest.php
index 412fa82cbc2..b9f619feb7b 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetReverseColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetReverseColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetSetDICest.php
index bb5389bbce7..0194258c2da 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetStrategyCest.php
index 9beceea80b6..9d4a1d83b2d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/GetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/HasAttributeCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/HasAttributeCest.php
index c986c7485f4..efc7aa5ae7d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/HasAttributeCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/HasAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/IsEmptyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/IsEmptyCest.php
index 8e56991939a..75b4f7cc2d0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/IsEmptyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/IsEmptyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadCest.php
index 98ce8355ae7..bceee64c314 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapCest.php
index aa6fd37f62b..863b9bd65e7 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapIndexCest.php
index 2d81aa72403..de913924224 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadColumnMapIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataCest.php
index 07e2a40c1c7..8edaba71bf0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataIndexCest.php
index 7fdc51cc91e..cddaab0c7bc 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ReadMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ResetCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ResetCest.php
index c414fd22664..59e3e2965a4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ResetCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticCreateAttributesCest.php
index ffc3a4d6079..2c4c5b850b4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticUpdateAttributesCest.php
index a9732b3b53b..807060bbccb 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetEmptyStringAttributesCest.php
index 519180fffa0..0f4bbefd8cc 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetStrategyCest.php
index 1df173ab1ad..5a0285ac132 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/SetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteCest.php
index fc1624114d0..b4a5381b229 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteMetaDataIndexCest.php
index ecb1acdf8da..8ff36b7f2ca 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Apcu/WriteMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Apcu;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Apcu;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticCreateAttributesCest.php
index de4dd987c4c..342e6f36796 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticUpdateAttributesCest.php
index ca3d21a776b..8bd8e72451f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetBindTypesCest.php
index 3ed138ffd91..74012f51e09 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetDataTypesNumericCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetDataTypesNumericCest.php
index c4e26c026bf..69b5d61bfaa 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetDataTypesNumericCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetDataTypesNumericCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetDefaultValuesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetDefaultValuesCest.php
index f6b533457d3..5a87368fa96 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetDefaultValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetDefaultValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetEmptyStringAttributesCest.php
index 2842b1e7236..a2bcafc0f6b 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetPrimaryKeyAttributesCest.php
index 384072fe27a..c76a38f65ca 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetReverseColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetReverseColumnMapCest.php
index e3f6b2bf161..9f32eb44e09 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetReverseColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetReverseColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/GetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/GetStrategyCest.php
index 9d820fa65cc..b07dfbea8f3 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/GetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/GetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/IsEmptyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/IsEmptyCest.php
index 8fa3feb3fbd..9d0e049360f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/IsEmptyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/IsEmptyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ConstructCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ConstructCest.php
index 2a69d89c1fb..e7b06cb572d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ConstructCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Mvc\Model\MetaData\Libmemcached;
 use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function dataDir;
 use function getOptionsLibmemcached;
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAttributesCest.php
index 157f79c15ee..c472bc46c77 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticCreateAttributesCest.php
index f984ad216b5..6a7b4f84a05 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticUpdateAttributesCest.php
index 0ef76a7d3bd..e57f5209c68 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetBindTypesCest.php
index 9e5d6547aa1..34161e2d5c2 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetColumnMapCest.php
index 1586c2d9159..000aa79e40e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesCest.php
index 3cc70043dab..c3975530a6d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesNumericCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesNumericCest.php
index 1ce66315cc0..eb998aaccc8 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesNumericCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDataTypesNumericCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDefaultValuesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDefaultValuesCest.php
index 28f1f8cb625..5657655b8de 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDefaultValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetDefaultValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetEmptyStringAttributesCest.php
index d4e296506a9..e8becf0a01b 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetIdentityFieldCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetIdentityFieldCest.php
index 4533a331721..569d44d8bc3 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetIdentityFieldCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetIdentityFieldCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNonPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNonPrimaryKeyAttributesCest.php
index 3d14e095097..845a49da124 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNonPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNonPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNotNullAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNotNullAttributesCest.php
index e25b1005aec..fe5cd07c6d4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNotNullAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetNotNullAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetPrimaryKeyAttributesCest.php
index 8a4995944ca..07b4c8562a6 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetReverseColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetReverseColumnMapCest.php
index dac73b4e3ef..653f5a7d645 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetReverseColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetReverseColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetSetDICest.php
index 06fd13e40ad..2d40550c8ea 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetStrategyCest.php
index 525206e1401..20ad5cbe552 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/GetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/HasAttributeCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/HasAttributeCest.php
index 79b96fe9da3..03c196e139a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/HasAttributeCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/HasAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/IsEmptyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/IsEmptyCest.php
index 4dee0276dd2..c549a250f32 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/IsEmptyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/IsEmptyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadCest.php
index d0a10bf59e5..c84fc9ac521 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapCest.php
index 2052734f762..8aec53e9d39 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapIndexCest.php
index 6efac11d058..285a3c17ecd 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadColumnMapIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataCest.php
index 7cff042ae24..188a21018bb 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataIndexCest.php
index 51632911cc3..902d5b7eb61 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ReadMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ResetCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ResetCest.php
index e7e97953937..1de1985b7f1 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ResetCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticCreateAttributesCest.php
index 378dd970001..586383f3d2f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticUpdateAttributesCest.php
index 0a58c1433ef..9a77f0aa10d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetEmptyStringAttributesCest.php
index fb56319e8d6..17c5b3ba02c 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetStrategyCest.php
index 947662dde38..d7f65467cf4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/SetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteCest.php
index 73d9239ec05..5957bde730d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\MetaData\Libmemcached;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function getOptionsLibmemcached;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteMetaDataIndexCest.php
index 6d7b64a1034..90962291692 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Libmemcached/WriteMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Libmemcached;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Libmemcached;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ConstructCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ConstructCest.php
index fd6dd8971e3..0cc136ca81a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ConstructCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\MetaData\Memory;
 use Phalcon\Mvc\Model\MetaDataInterface;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\Robotto;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\Robotto;
 
 use function dataDir;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAttributesCest.php
index ec05f1d7fe3..8d2db402f72 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticCreateAttributesCest.php
index 15b0c76d6a3..3a3e79ba4ef 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticUpdateAttributesCest.php
index 09134c067c7..8246c2ee4e4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetBindTypesCest.php
index 9edad6231b6..8aedd38047f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetColumnMapCest.php
index 84867a74f02..90fdc4c54e8 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesCest.php
index 56a52105ac1..451a7f5e707 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesNumericCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesNumericCest.php
index 0bd23709fc5..8055cf78685 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesNumericCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDataTypesNumericCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDefaultValuesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDefaultValuesCest.php
index 8b04e4d31a2..8b0022f0166 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDefaultValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetDefaultValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetEmptyStringAttributesCest.php
index 40674687855..728405e1a96 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetIdentityFieldCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetIdentityFieldCest.php
index eec94a047cd..0a79ee7842a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetIdentityFieldCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetIdentityFieldCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNonPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNonPrimaryKeyAttributesCest.php
index 62c1829d4db..57a4eb8ff99 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNonPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNonPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNotNullAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNotNullAttributesCest.php
index 99e716a6330..5984a3feb8c 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNotNullAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetNotNullAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetPrimaryKeyAttributesCest.php
index 2bdcbea9c60..a9386158f1a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetReverseColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetReverseColumnMapCest.php
index 94f3a3dae13..600f20c31af 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetReverseColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetReverseColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetSetDICest.php
index 705d9ab4f20..b72cd5548ac 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetStrategyCest.php
index 6713cbd9932..02e18514ca1 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/GetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/HasAttributeCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/HasAttributeCest.php
index 9c840fe0c9a..942a10c38cb 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/HasAttributeCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/HasAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/IsEmptyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/IsEmptyCest.php
index fbe41fc6ff2..28579437375 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/IsEmptyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/IsEmptyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadCest.php
index 3f431a543a9..0142fe2898d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapCest.php
index 4b086f1ba2b..6f66574485c 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapIndexCest.php
index c9f8bdf32ba..8cfd7d3ab0a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadColumnMapIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataCest.php
index 6f06774bbde..9ef51ec3768 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataIndexCest.php
index f4e2d93c5ed..b161b9ffafc 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ReadMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ResetCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ResetCest.php
index a681efa3021..2d6a6a8e42b 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/ResetCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticCreateAttributesCest.php
index 1160292396f..25a1fe93d18 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticUpdateAttributesCest.php
index 488a5484a1c..19f52ea210a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetEmptyStringAttributesCest.php
index 21193f8483e..7ea1e8d74e0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetStrategyCest.php
index d175a53371e..5506c2e81b5 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/SetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteCest.php
index 3839ed7fe6c..80edbb26937 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteMetaDataIndexCest.php
index c3e251a4103..7dcbe83ac90 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Memory/WriteMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Memory;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Memory;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/ReadCest.php b/tests/tocheck-database/Mvc/Model/MetaData/ReadCest.php
index 79d2247ba84..c58f3b9dfd3 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/ReadCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapCest.php
index fd30ebc473d..2251bd2d179 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapIndexCest.php
index 3e115c17041..d8f27677267 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/ReadColumnMapIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataCest.php
index 4ba7fe9b81a..c454f99d665 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataIndexCest.php
index d27a3339de7..e83e0712aa0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/ReadMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ConstructCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ConstructCest.php
index ad3679df80e..91ff38ab3a0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ConstructCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Mvc\Model\MetaData\Redis;
 use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Storage\SerializerFactory;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function dataDir;
 use function env;
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAttributesCest.php
index f5c2fbcbcbb..3a75e827402 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticCreateAttributesCest.php
index a41af372c9c..99ab34e91ac 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticUpdateAttributesCest.php
index 3d4d8f18b90..7ae33493706 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetBindTypesCest.php
index 28007f669fe..3d043124298 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetColumnMapCest.php
index 58bf3ca1d19..9ea8550e32a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesCest.php
index 2a346b307c5..ad26726915a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesNumericCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesNumericCest.php
index d35493d594b..093a1659882 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesNumericCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDataTypesNumericCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDefaultValuesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDefaultValuesCest.php
index 483f1b6c88f..be99b940847 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDefaultValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetDefaultValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetEmptyStringAttributesCest.php
index fc875fee1f3..1837d8e405e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetIdentityFieldCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetIdentityFieldCest.php
index df539cd7a14..7a2ef8c1119 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetIdentityFieldCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetIdentityFieldCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNonPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNonPrimaryKeyAttributesCest.php
index 3ee7e26af6f..4f1b66cdd4f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNonPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNonPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNotNullAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNotNullAttributesCest.php
index 238769532a8..0290236d6b4 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNotNullAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetNotNullAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetPrimaryKeyAttributesCest.php
index 39c3f1b7baa..c5e720c11f2 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetReverseColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetReverseColumnMapCest.php
index 152400010ee..7416b2cef6e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetReverseColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetReverseColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetSetDICest.php
index 1ef470597db..997a325d976 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetStrategyCest.php
index c206d44622c..fa80f5cfd5f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/GetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/HasAttributeCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/HasAttributeCest.php
index 75142950302..e194d1334f9 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/HasAttributeCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/HasAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/IsEmptyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/IsEmptyCest.php
index b5c0a1113f1..6ea74bfac01 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/IsEmptyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/IsEmptyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadCest.php
index b963df97a1b..bd48b6383aa 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapCest.php
index 0013fedb1b5..d59e9a64b84 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapIndexCest.php
index 2d4358aeb60..291f32331b3 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadColumnMapIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataCest.php
index f32fcb3dab6..cc34d42815e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataIndexCest.php
index f4b672da831..b6c62aeedbb 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ReadMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ResetCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ResetCest.php
index 0274fbe61a9..bc65e5e5df6 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/ResetCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticCreateAttributesCest.php
index f7be8e3786b..c9ffe418442 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticUpdateAttributesCest.php
index e754e0204cd..8b73c4a2186 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetEmptyStringAttributesCest.php
index 5c4d4f33a60..59591a266bf 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetStrategyCest.php
index 4336ea39efd..d85d4c4b87f 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/SetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteCest.php
index e907e17c8cd..c5e709aa2b3 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteMetaDataIndexCest.php
index 2e23ecf6928..d47efd1aa04 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Redis/WriteMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Redis;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Redis;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/ResetCest.php b/tests/tocheck-database/Mvc/Model/MetaData/ResetCest.php
index 5d0f978c569..ee42fc155ff 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/ResetCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticCreateAttributesCest.php
index 9a048a7d2a6..9214f570535 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticUpdateAttributesCest.php
index 8df41779b2e..748eef948ad 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/SetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/SetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/SetEmptyStringAttributesCest.php
index ef7175a40ae..95ff03cb060 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/SetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/SetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/SetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/SetStrategyCest.php
index 9cc1cf65c0e..4aabc7d50ef 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/SetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/SetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetColumnMapsCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetColumnMapsCest.php
index d7493690c5f..69ba5a8f6ed 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetColumnMapsCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetColumnMapsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Strategy\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Strategy\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetMetaDataCest.php
index 3bfa05c7837..acb84ea75b8 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Annotations/GetMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Strategy\Annotations;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Strategy\Annotations;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetColumnMapsCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetColumnMapsCest.php
index 11400065610..88c76d1f392 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetColumnMapsCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetColumnMapsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Strategy\Introspection;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Strategy\Introspection;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetMetaDataCest.php
index 8143475d08f..16f910f5e70 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Introspection/GetMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Strategy\Introspection;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Strategy\Introspection;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Refactor-AnnotationsCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Refactor-AnnotationsCest.php
index 06bb64f8784..7c66e05f342 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Refactor-AnnotationsCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Strategy/Refactor-AnnotationsCest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Strategy;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Strategy;
 
 use IntegrationTester;
 use Phalcon\Db\Column;
 use Phalcon\Mvc\Model\MetaData\Memory;
 use Phalcon\Mvc\Model\MetaData\Strategy\Annotations;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Annotations\Robot;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Annotations\Robot;
 
 class AnnotationsCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ConstructCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ConstructCest.php
index bba10bed01f..848667ed11d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\MetaData\Stream;
 use Phalcon\Mvc\Model\MetaDataInterface;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function cacheDir;
 use function dataDir;
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAttributesCest.php
index 2d45b1f1e16..f3ab944efb0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticCreateAttributesCest.php
index 008b7015e0a..68a573f854c 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticUpdateAttributesCest.php
index 49efd183178..39ac4fc84aa 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetBindTypesCest.php
index de028ab84d6..fb86bf355e8 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetColumnMapCest.php
index 74e187981de..c0f0dfd9e66 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesCest.php
index 6baf950d7df..85b9ec1bce0 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesNumericCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesNumericCest.php
index 40f6318d546..2a5c9dc5342 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesNumericCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDataTypesNumericCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDefaultValuesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDefaultValuesCest.php
index b4b355858fc..ef80ee4579a 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDefaultValuesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetDefaultValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetEmptyStringAttributesCest.php
index 9676dbf68b4..32321277819 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetIdentityFieldCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetIdentityFieldCest.php
index de793374c8a..54d5fe50e58 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetIdentityFieldCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetIdentityFieldCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNonPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNonPrimaryKeyAttributesCest.php
index efc5d1c9f70..714e20ab132 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNonPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNonPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNotNullAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNotNullAttributesCest.php
index 4fdb3ad731c..c4cc3d3b181 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNotNullAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetNotNullAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetPrimaryKeyAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetPrimaryKeyAttributesCest.php
index 491909ef13d..ced941e7834 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetPrimaryKeyAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetPrimaryKeyAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetReverseColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetReverseColumnMapCest.php
index ece9154e05d..a58a7a3836c 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetReverseColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetReverseColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetSetDICest.php
index 6d2a1b788c9..9c86aff0d2e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetStrategyCest.php
index 82d74c4cd17..eb322cf8221 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/GetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/HasAttributeCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/HasAttributeCest.php
index c7a0f6bcd9c..274b158cf31 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/HasAttributeCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/HasAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/IsEmptyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/IsEmptyCest.php
index c806168e0d0..d4c90ff6620 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/IsEmptyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/IsEmptyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadCest.php
index b612bd4a862..21b9f760b15 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapCest.php
index b47df7e3591..c15884b4280 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapIndexCest.php
index 72f26305efc..72e062f9f98 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadColumnMapIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataCest.php
index fb1ce580391..4d8bd3bf23b 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataIndexCest.php
index 3900de50e5e..8ee7bd1301d 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ReadMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ResetCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ResetCest.php
index 99501f3c3b1..c857fad60a1 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/ResetCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticCreateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticCreateAttributesCest.php
index 91800839ed5..c84f85636e9 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticCreateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticCreateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticUpdateAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticUpdateAttributesCest.php
index 3818d5441a5..c906e494f46 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticUpdateAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetAutomaticUpdateAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetEmptyStringAttributesCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetEmptyStringAttributesCest.php
index 9cc5abfeddf..d675d50cbac 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetEmptyStringAttributesCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetEmptyStringAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetStrategyCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetStrategyCest.php
index c6a660913aa..e9cd09b3139 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/SetStrategyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteCest.php
index a789c5b9413..f435a8ad5ce 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\MetaData\Stream;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function file_exists;
 use function file_put_contents;
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteMetaDataIndexCest.php
index 671c7f4951e..c6d5360b98e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/Stream/WriteMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData\Stream;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData\Stream;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/WriteCest.php b/tests/tocheck-database/Mvc/Model/MetaData/WriteCest.php
index f2964d0127a..858bc7b411e 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/WriteCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/WriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/MetaData/WriteMetaDataIndexCest.php b/tests/tocheck-database/Mvc/Model/MetaData/WriteMetaDataIndexCest.php
index b2f4751e157..39bc408eb06 100644
--- a/tests/tocheck-database/Mvc/Model/MetaData/WriteMetaDataIndexCest.php
+++ b/tests/tocheck-database/Mvc/Model/MetaData/WriteMetaDataIndexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\MetaData;
+namespace Phalcon\Tests\Integration\Mvc\Model\MetaData;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/AddFromCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/AddFromCest.php
index c151f341cab..d32cf77ecdc 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/AddFromCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/AddFromCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/AndHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/AndHavingCest.php
index 495df8a7b38..a40f1b61aa9 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/AndHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/AndHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/AndWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/AndWhereCest.php
index 827505f7f37..58375f748c7 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/AndWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/AndWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/AutoescapeCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/AutoescapeCest.php
index 531261b2dbb..c407131cf9e 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/AutoescapeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/AutoescapeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenHavingCest.php
index 675ffe88330..407948c3105 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenWhereCest.php
index 172cc9249b5..ac8687b25da 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/BetweenWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/ColumnsCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/ColumnsCest.php
index 44c3d23015c..8a8edecb745 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/ColumnsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/ColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/ConstructCest.php
index ece9910cc7d..0a90477415e 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/ConstructCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class ConstructCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/DistinctCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/DistinctCest.php
index 5055d0905e4..a4ce64a4e43 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/DistinctCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/DistinctCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class DistinctCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/ForUpdateCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/ForUpdateCest.php
index 4f0de92d03c..729fab07baa 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/ForUpdateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/ForUpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/FromCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/FromCest.php
index d11d08d094b..cc1b482e4eb 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/FromCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/FromCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Models\RobotsParts;
+use Phalcon\Tests\Models\RobotsParts;
 
 /**
  * Class FromCest
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindParamsCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindParamsCest.php
index 03378bea925..31f07726b64 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindParamsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindTypesCest.php
index 7077c267287..54c9df92823 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetColumnsCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetColumnsCest.php
index b2e0080f657..6e418882e41 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetColumnsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetColumnsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetDistinctCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetDistinctCest.php
index 4b746f743f8..6d1e2a27f34 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetDistinctCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetDistinctCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetFromCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetFromCest.php
index 0a6f6635b0d..cd55e2a7e11 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetFromCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetFromCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetGroupByCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetGroupByCest.php
index 3c69f5efd46..0e75daf4981 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetGroupByCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetGroupByCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetHavingCest.php
index 22460b95009..6b8b1b08e29 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetJoinsCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetJoinsCest.php
index e9a5c2e36b1..db8641507ba 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetJoinsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetJoinsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetLimitCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetLimitCest.php
index d3091ba701f..085430e05ac 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetLimitCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetLimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetModelsCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetModelsCest.php
index 1d7e27c8f9b..6d89561cd01 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetModelsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetModelsCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\RobotsParts;
-use Phalcon\Test\Models\Stock;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\RobotsParts;
+use Phalcon\Tests\Models\Stock;
 
 class GetModelsCest
 {
@@ -70,7 +70,7 @@ public function mvcModelQueryBuilderGetModelsString(IntegrationTester $I)
             ->from(['Stock' => Stock::class])
         ;
 
-        $expected = \Phalcon\Test\Models\Stock::class;
+        $expected = \Phalcon\Tests\Models\Stock::class;
         $actual   = $builder->getModels();
         $I->assertEquals($expected, $actual);
     }
@@ -94,8 +94,8 @@ public function mvcModelQueryBuilderGetModelsArray(IntegrationTester $I)
         ;
 
         $expected = [
-            'Robots'      => \Phalcon\Test\Models\Robots::class,
-            'RobotsParts' => \Phalcon\Test\Models\RobotsParts::class,
+            'Robots'      => \Phalcon\Tests\Models\Robots::class,
+            'RobotsParts' => \Phalcon\Tests\Models\RobotsParts::class,
         ];
         $actual   = $builder->getModels();
         $I->assertEquals($expected, $actual);
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetOffsetCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetOffsetCest.php
index 778b7f2161c..ab8612085f4 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetOffsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetOffsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetOrderByCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetOrderByCest.php
index a2b3d61f4d2..aa56fe7c18f 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetOrderByCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetOrderByCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetPhqlCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetPhqlCest.php
index 6dfff6968a1..34e117aea2b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetPhqlCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetPhqlCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class GetPhqlCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetQueryCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetQueryCest.php
index 5bcfa1d1c72..52888af8f82 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetQueryCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetQueryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetSetDICest.php
index c40fa714f50..2a48616d63b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GetWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GetWhereCest.php
index 2c7485c11e9..6c051918c76 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GetWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GetWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/GroupByCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/GroupByCest.php
index aa712727734..af5090b667d 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/GroupByCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/GroupByCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class GroupByCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/HavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/HavingCest.php
index 331a1137187..bec5af1de2b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/HavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/HavingCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use PDO;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class HavingCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/InHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/InHavingCest.php
index 54526734c81..fbef2c14f49 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/InHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/InHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/InWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/InWhereCest.php
index 092fcededca..bc7f54cec49 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/InWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/InWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/InnerJoinCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/InnerJoinCest.php
index 3331180f914..6919538e3f7 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/InnerJoinCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/InnerJoinCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/JoinCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/JoinCest.php
index 58f35e74ee1..0166d7ac58a 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/JoinCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/JoinCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/LeftJoinCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/LeftJoinCest.php
index 678439ea0e2..90bea7fa4b7 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/LeftJoinCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/LeftJoinCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/LimitCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/LimitCest.php
index be41a88115b..d2164fa3033 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/LimitCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/LimitCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class LimitCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenHavingCest.php
index 88c327ab3d9..8a118ebd551 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenWhereCest.php
index 59f152470a9..73a80001ff1 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/NotBetweenWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/NotInHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/NotInHavingCest.php
index 70f717e4f86..597624d8192 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/NotInHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/NotInHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/NotInWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/NotInWhereCest.php
index 860419fd818..53aba984244 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/NotInWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/NotInWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/OffsetCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/OffsetCest.php
index d071de2df3b..e22162010d0 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/OffsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/OffsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/OrHavingCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/OrHavingCest.php
index 0230c87b454..78e62c73dde 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/OrHavingCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/OrHavingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/OrWhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/OrWhereCest.php
index f3f922a4900..3be4a8a9b0b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/OrWhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/OrWhereCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/OrderByCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/OrderByCest.php
index c81074d696f..3fe29fa69c0 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/OrderByCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/OrderByCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 class OrderByCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/RightJoinCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/RightJoinCest.php
index e2231db8d0b..1c36f01b9b4 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/RightJoinCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/RightJoinCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindParamsCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindParamsCest.php
index b0525bc7748..061df9965c9 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindParamsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindTypesCest.php
index 80226299e9d..596fdc4e597 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/SetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Builder/WhereCest.php b/tests/tocheck-database/Mvc/Model/Query/Builder/WhereCest.php
index f409da9cac3..b498c84c6fb 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Builder/WhereCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Builder/WhereCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Builder;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Builder;
 
 use IntegrationTester;
 use PDO;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 class WhereCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/CleanCest.php b/tests/tocheck-database/Mvc/Model/Query/CleanCest.php
index 7fc44437981..860f34ffa13 100644
--- a/tests/tocheck-database/Mvc/Model/Query/CleanCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/CleanCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Query/ConstructCest.php
index 8f7ebada0f0..1e12fc129f2 100644
--- a/tests/tocheck-database/Mvc/Model/Query/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/ExecuteCest.php b/tests/tocheck-database/Mvc/Model/Query/ExecuteCest.php
index db1f2d7d545..80d40a3255c 100644
--- a/tests/tocheck-database/Mvc/Model/Query/ExecuteCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/ExecuteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetBindParamsCest.php b/tests/tocheck-database/Mvc/Model/Query/GetBindParamsCest.php
index 7a0e48e9508..7aca39fd5e7 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetBindParamsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetBindParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/Query/GetBindTypesCest.php
index 0f8a87aca30..6e5f6adce43 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetCacheCest.php b/tests/tocheck-database/Mvc/Model/Query/GetCacheCest.php
index 176d958b6a4..97486b69985 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetCacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetCacheOptionsCest.php b/tests/tocheck-database/Mvc/Model/Query/GetCacheOptionsCest.php
index 3fa2b7261dc..2eee3eccfdd 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetCacheOptionsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetCacheOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetIntermediateCest.php b/tests/tocheck-database/Mvc/Model/Query/GetIntermediateCest.php
index 7b14422d28e..fc548d1344b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetIntermediateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetIntermediateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetSetDICest.php b/tests/tocheck-database/Mvc/Model/Query/GetSetDICest.php
index 69dd74e9e7b..442e577441e 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetSetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetSetTransactionCest.php b/tests/tocheck-database/Mvc/Model/Query/GetSetTransactionCest.php
index 8296586bbb7..b189a11f351 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetSetTransactionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetSetTransactionCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query;
 use Phalcon\Mvc\Model\Transaction;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetSetTransactionCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetSingleResultCest.php b/tests/tocheck-database/Mvc/Model/Query/GetSingleResultCest.php
index 26d512eca95..db64c669fc2 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetSingleResultCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetSingleResultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetTypeCest.php b/tests/tocheck-database/Mvc/Model/Query/GetTypeCest.php
index d5c3c76f4c7..f06bb3dc04b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetTypeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/GetUniqueRowCest.php b/tests/tocheck-database/Mvc/Model/Query/GetUniqueRowCest.php
index 0b69b7f6d6e..b03d1da8c47 100644
--- a/tests/tocheck-database/Mvc/Model/Query/GetUniqueRowCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/GetUniqueRowCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Lang/ParsePHQLCest.php b/tests/tocheck-database/Mvc/Model/Query/Lang/ParsePHQLCest.php
index 02ee8af0cdc..c2ff5bfe31f 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Lang/ParsePHQLCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Lang/ParsePHQLCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Lang;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Lang;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/ParseCest.php b/tests/tocheck-database/Mvc/Model/Query/ParseCest.php
index 204fbc917b5..512a380426c 100644
--- a/tests/tocheck-database/Mvc/Model/Query/ParseCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/ParseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Refactor-BuilderCest.php b/tests/tocheck-database/Mvc/Model/Query/Refactor-BuilderCest.php
index 258276100e4..f747c3f44bc 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Refactor-BuilderCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Refactor-BuilderCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 use PDO;
@@ -17,10 +17,10 @@
 use Phalcon\Cache\Frontend\Data;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Parts;
-use Phalcon\Test\Models\RobotsParts;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Parts;
+use Phalcon\Tests\Models\RobotsParts;
+use Phalcon\Tests\Models\Snapshot\Robots;
 
 use function outputDir;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/SetBindParamsCest.php b/tests/tocheck-database/Mvc/Model/Query/SetBindParamsCest.php
index f24362226de..f038385cf29 100644
--- a/tests/tocheck-database/Mvc/Model/Query/SetBindParamsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/SetBindParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/SetBindTypesCest.php b/tests/tocheck-database/Mvc/Model/Query/SetBindTypesCest.php
index 21eaf9d6135..cbbc8fe46be 100644
--- a/tests/tocheck-database/Mvc/Model/Query/SetBindTypesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/SetBindTypesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/SetIntermediateCest.php b/tests/tocheck-database/Mvc/Model/Query/SetIntermediateCest.php
index c59e4658a63..9af2a49667d 100644
--- a/tests/tocheck-database/Mvc/Model/Query/SetIntermediateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/SetIntermediateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/SetSharedLockCest.php b/tests/tocheck-database/Mvc/Model/Query/SetSharedLockCest.php
index b22eaf1aebc..69444dc963b 100644
--- a/tests/tocheck-database/Mvc/Model/Query/SetSharedLockCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/SetSharedLockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/SetTypeCest.php b/tests/tocheck-database/Mvc/Model/Query/SetTypeCest.php
index 1df9f5941b6..07bdd5f86f2 100644
--- a/tests/tocheck-database/Mvc/Model/Query/SetTypeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/SetUniqueRowCest.php b/tests/tocheck-database/Mvc/Model/Query/SetUniqueRowCest.php
index 0a2bfe99533..9443ed8a891 100644
--- a/tests/tocheck-database/Mvc/Model/Query/SetUniqueRowCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/SetUniqueRowCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Status/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Query/Status/ConstructCest.php
index efd14b9875f..14d0ffe8587 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Status/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Status/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Status;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Status;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Status/GetMessagesCest.php b/tests/tocheck-database/Mvc/Model/Query/Status/GetMessagesCest.php
index b81025c5098..cf50f3da3c4 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Status/GetMessagesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Status/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Status;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Status;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Status/GetModelCest.php b/tests/tocheck-database/Mvc/Model/Query/Status/GetModelCest.php
index 93d8ce391b9..d93ed716176 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Status/GetModelCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Status/GetModelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Status;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Status;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Query/Status/SuccessCest.php b/tests/tocheck-database/Mvc/Model/Query/Status/SuccessCest.php
index ae92577cfe9..15f7b144b21 100644
--- a/tests/tocheck-database/Mvc/Model/Query/Status/SuccessCest.php
+++ b/tests/tocheck-database/Mvc/Model/Query/Status/SuccessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Query\Status;
+namespace Phalcon\Tests\Integration\Mvc\Model\Query\Status;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-BinderCest.php b/tests/tocheck-database/Mvc/Model/Refactor-BinderCest.php
index 4fee25b7141..7daa7f16665 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-BinderCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-BinderCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Cache\Backend\Apc;
@@ -12,15 +12,15 @@
 use Phalcon\Mvc\Model\Binder;
 use Phalcon\Mvc\Model\Manager;
 use Phalcon\Mvc\Model\MetaData\Memory;
-use Phalcon\Test\Models\People;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Models\People;
+use Phalcon\Tests\Models\Robots;
 use Test10Controller;
 use Test11Controller;
 use Test9Controller;
 use TypeError;
 
 /**
- * \Phalcon\Test\Integration\Mvc\Model\BindingCest
+ * \Phalcon\Tests\Integration\Mvc\Model\BindingCest
  * Tests the Phalcon\Mvc\Application component
  *
  * @copyright (c) 2011-2016 Phalcon Team
@@ -208,12 +208,12 @@ public function testDispatcherMultiBinding(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -252,7 +252,7 @@ public function testDispatcherSingleBindingWithInterface(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -290,12 +290,12 @@ public function testDispatcherMultiBindingWithInterface(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -351,7 +351,7 @@ function () use ($dispatcher) {
             $returnedValue = $dispatcher->getReturnedValue();
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -391,7 +391,7 @@ function (People $people) {
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -445,12 +445,12 @@ function (People $people, Robots $robot) {
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -487,9 +487,9 @@ function (People $people) {
 
         $I->expectThrowable(
             new TypeError(
-                'Argument 1 passed to Phalcon\Test\Integration\Mvc\Model\BinderCest::' .
-                'Phalcon\Test\Integration\Mvc\Model\{closure}() must be an instance ' .
-                'of Phalcon\Test\Models\People, string given'
+                'Argument 1 passed to Phalcon\Tests\Integration\Mvc\Model\BinderCest::' .
+                'Phalcon\Tests\Integration\Mvc\Model\{closure}() must be an instance ' .
+                'of Phalcon\Tests\Models\People, string given'
             ),
             function () use ($micro) {
                 $micro->handle(
@@ -506,7 +506,7 @@ function () use ($micro) {
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -548,7 +548,7 @@ public function testMicroControllerSingleBinding(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -590,12 +590,12 @@ public function testMicroControllerMultiBinding(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -637,7 +637,7 @@ public function testMicroControllerSingleBindingWithInterface(IntegrationTester
             $returnedValue = $micro->handle('/' . $this->people->cedula);
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -679,12 +679,12 @@ public function testMicroControllerMultiBindingWithInterface(IntegrationTester $
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -741,7 +741,7 @@ function () use ($micro) {
             $returnedValue = $micro->handle('/' . $this->people->cedula);
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -782,7 +782,7 @@ public function testMicroLazySingleBinding(IntegrationTester $I)
             $returnedValue = $micro->handle('/' . $this->people->cedula);
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -825,12 +825,12 @@ public function testMicroLazyMultiBinding(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -873,7 +873,7 @@ public function testMicroLazySingleBindingWithInterface(IntegrationTester $I)
             $returnedValue = $micro->handle('/' . $this->people->cedula);
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -916,12 +916,12 @@ public function testMicroLazyMultiBindingWithInterface(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue[0]
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\Robots::class,
+                \Phalcon\Tests\Models\Robots::class,
                 $returnedValue[1]
             );
 
@@ -979,7 +979,7 @@ function () use ($micro) {
             $returnedValue = $micro->handle('/' . $this->people->cedula);
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
@@ -1017,7 +1017,7 @@ public function testDispatcherSingleBindingOriginalValues(IntegrationTester $I)
         );
 
         $I->assertInstanceOf(
-            \Phalcon\Test\Models\People::class,
+            \Phalcon\Tests\Models\People::class,
             $returnedValue
         );
 
@@ -1055,7 +1055,7 @@ public function testDispatcherSingleBindingNoCache(IntegrationTester $I)
             );
 
             $I->assertInstanceOf(
-                \Phalcon\Test\Models\People::class,
+                \Phalcon\Tests\Models\People::class,
                 $returnedValue
             );
 
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-CriteriaCest.php b/tests/tocheck-database/Mvc/Model/Refactor-CriteriaCest.php
index e64fb659181..ce68d25f381 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-CriteriaCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-CriteriaCest.php
@@ -9,19 +9,19 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\People;
-use Phalcon\Test\Models\Personas;
-use Phalcon\Test\Models\Personers;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\Users;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\People;
+use Phalcon\Tests\Models\Personas;
+use Phalcon\Tests\Models\Personers;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\Users;
 
 use function cacheModelsDir;
 
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-DynamicOperationsCest.php b/tests/tocheck-database/Mvc/Model/Refactor-DynamicOperationsCest.php
index d0fd5219c7b..0e0861934cd 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-DynamicOperationsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-DynamicOperationsCest.php
@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DateTime;
 use IntegrationTester;
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Db\RawValue;
 use Phalcon\Events\Event;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Dynamic\Personas;
-use Phalcon\Test\Models\Dynamic\Personers;
-use Phalcon\Test\Models\Dynamic\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Dynamic\Personas;
+use Phalcon\Tests\Models\Dynamic\Personers;
+use Phalcon\Tests\Models\Dynamic\Robots;
 
 class DynamicOperationsCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ManagerCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ManagerCest.php
index 1a7bd627b42..92f0a1f0b09 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ManagerCest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Manager;
 use Phalcon\Mvc\Model\Row;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\People;
-use Phalcon\Test\Models\Relations\RobotsParts;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\People;
+use Phalcon\Tests\Models\Relations\RobotsParts;
 
 class ManagerCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsEventsCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsEventsCest.php
index afca26b8ca5..93b1dc54b5c 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsEventsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsEventsCest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Manager as ModelManager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\GossipRobots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\GossipRobots;
 
 class ModelsEventsCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsForeignKeysCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsForeignKeysCest.php
index 7616f36cc39..81186864592 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsForeignKeysCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsForeignKeysCest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Messages\Message;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Deles;
-use Phalcon\Test\Models\Parts;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\RobotsParts;
-use Phalcon\Test\Models\Robotters;
-use Phalcon\Test\Models\RobottersDeles;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Deles;
+use Phalcon\Tests\Models\Parts;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\RobotsParts;
+use Phalcon\Tests\Models\Robotters;
+use Phalcon\Tests\Models\RobottersDeles;
 
 class ModelsForeignKeysCest
 {
@@ -93,7 +93,7 @@ public function executeTestsNormal(IntegrationTester $I, Example $example)
 
         $messages = [
             0 => new Message(
-                'Record is referenced by model Phalcon\Test\Models\RobotsParts',
+                'Record is referenced by model Phalcon\Tests\Models\RobotsParts',
                 'id',
                 'ConstraintViolation'
             ),
@@ -192,7 +192,7 @@ public function executeTestsRenamed(IntegrationTester $I, Example $example)
 
         $messages = [
             0 => new Message(
-                'Record is referenced by model Phalcon\Test\Models\RobottersDeles',
+                'Record is referenced by model Phalcon\Tests\Models\RobottersDeles',
                 'code',
                 'ConstraintViolation'
             ),
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataCest.php
index ef2fd8d3c6f..1cab4dd18ef 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataCest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Personas;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Personas;
+use Phalcon\Tests\Models\Robots;
 
 class ModelsMetadataCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataStrategyCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataStrategyCest.php
index 005c6ad9dca..179c645c9a6 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataStrategyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsMetadataStrategyCest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\MetaData\Memory;
 use Phalcon\Mvc\Model\MetaData\Strategy\Annotations;
 use Phalcon\Mvc\Model\MetaData\Strategy\Introspection;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Boutique\Robots as BoutiqueRobots;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Boutique\Robots as BoutiqueRobots;
+use Phalcon\Tests\Models\Robots;
 
 class ModelsMetadataStrategyCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsQueryExecuteCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsQueryExecuteCest.php
index 6047dd49afd..f35806c075a 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsQueryExecuteCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsQueryExecuteCest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class ModelsQueryExecuteCest
 {
@@ -72,87 +72,87 @@ private function testSelectExecute(IntegrationTester $I)
         $manager = $this->container->getShared('modelsManager');
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots'
+            'SELECT * FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
         $I->assertCount(3, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots ORDER BY 1'
+            'SELECT * FROM Phalcon\Tests\Models\Robots ORDER BY 1'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
         $I->assertCount(3, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertEquals(1, $robots[0]->id);
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots ORDER BY id'
+            'SELECT * FROM Phalcon\Tests\Models\Robots ORDER BY id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
         $I->assertCount(3, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertEquals(1, $robots[0]->id);
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots ORDER BY Phalcon\Test\Models\Robots.id'
+            'SELECT * FROM Phalcon\Tests\Models\Robots ORDER BY Phalcon\Tests\Models\Robots.id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
         $I->assertCount(3, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertEquals(1, $robots[0]->id);
 
         $robots = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.* FROM Phalcon\Test\Models\Robots'
+            'SELECT Phalcon\Tests\Models\Robots.* FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertCount(3, $robots);
 
         $robots = $manager->executeQuery(
-            'SELECT r.* FROM Phalcon\Test\Models\Robots r'
+            'SELECT r.* FROM Phalcon\Tests\Models\Robots r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertCount(3, $robots);
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots r'
+            'SELECT * FROM Phalcon\Tests\Models\Robots r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertCount(3, $robots);
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots AS r'
+            'SELECT * FROM Phalcon\Tests\Models\Robots AS r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertCount(3, $robots);
 
         $robots = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robots AS r'
+            'SELECT * FROM Phalcon\Tests\Models\Robots AS r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $robots[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $robots[0]);
         $I->assertCount(3, $robots);
 
         $result = $manager->executeQuery(
-            'SELECT id, name FROM Phalcon\Test\Models\Robots'
+            'SELECT id, name FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.name FROM Phalcon\Test\Models\Robots'
+            'SELECT Phalcon\Tests\Models\Robots.name FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT LENGTH(name) AS the_length FROM Phalcon\Test\Models\Robots'
+            'SELECT LENGTH(name) AS the_length FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
@@ -161,8 +161,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(8, $result[0]->the_length);
 
         $result = $manager->executeQuery(
-            'SELECT LENGTH(Phalcon\Test\Models\Robots.name) AS the_length ' .
-            'FROM Phalcon\Test\Models\Robots'
+            'SELECT LENGTH(Phalcon\Tests\Models\Robots.name) AS the_length ' .
+            'FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
@@ -171,8 +171,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(8, $result[0]->the_length);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots WHERE id = 1'
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots WHERE id = 1'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(1, $result);
@@ -181,8 +181,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots WHERE id = ?0',
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots WHERE id = ?0',
             [0 => 1]
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
@@ -192,8 +192,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots WHERE id = :id:',
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots WHERE id = :id:',
             ['id' => 1]
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
@@ -203,8 +203,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots WHERE id = "1"'
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots WHERE id = "1"'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(1, $result);
@@ -213,15 +213,15 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT r.year FROM Phalcon\Test\Models\Robots r WHERE TRIM(name) != "Robotina"'
+            'SELECT r.year FROM Phalcon\Tests\Models\Robots r WHERE TRIM(name) != "Robotina"'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots ORDER BY id'
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots ORDER BY id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -230,8 +230,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots ORDER BY id LIMIT 2'
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots ORDER BY id LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -240,8 +240,8 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.id+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robots ORDER BY id DESC LIMIT 2'
+            'SELECT Phalcon\Tests\Models\Robots.id+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robots ORDER BY id DESC LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -250,7 +250,7 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(4, $result[0]->nextId);
 
         $result = $manager->executeQuery(
-            'SELECT r.name FROM Phalcon\Test\Models\Robots r ORDER BY r.name DESC LIMIT 2'
+            'SELECT r.name FROM Phalcon\Tests\Models\Robots r ORDER BY r.name DESC LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -259,7 +259,7 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->name, 'Terminator');
 
         $result = $manager->executeQuery(
-            'SELECT name le_name FROM Phalcon\Test\Models\Robots ORDER BY name ASC LIMIT 4'
+            'SELECT name le_name FROM Phalcon\Tests\Models\Robots ORDER BY name ASC LIMIT 4'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
@@ -268,7 +268,7 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals('Astro Boy', $result[0]->le_name);
 
         $result = $manager->executeQuery(
-            'SELECT r.name le_name FROM Phalcon\Test\Models\Robots r ORDER BY r.name ASC LIMIT 4'
+            'SELECT r.name le_name FROM Phalcon\Tests\Models\Robots r ORDER BY r.name ASC LIMIT 4'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
@@ -277,7 +277,7 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals('Astro Boy', $result[0]->le_name);
 
         $result = $manager->executeQuery(
-            'SELECT r.name le_name FROM Phalcon\Test\Models\Robots r ORDER BY r.name ASC LIMIT 1,2'
+            'SELECT r.name le_name FROM Phalcon\Tests\Models\Robots r ORDER BY r.name ASC LIMIT 1,2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -287,7 +287,7 @@ private function testSelectExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.name le_name ' .
-            'FROM Phalcon\Test\Models\Robots r ORDER BY r.name ASC LIMIT 2 OFFSET 1'
+            'FROM Phalcon\Tests\Models\Robots r ORDER BY r.name ASC LIMIT 2 OFFSET 1'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -297,7 +297,7 @@ private function testSelectExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.type, COUNT(*) number ' .
-            'FROM Phalcon\Test\Models\Robots r GROUP BY 1 ORDER BY r.type ASC'
+            'FROM Phalcon\Tests\Models\Robots r GROUP BY 1 ORDER BY r.type ASC'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -306,7 +306,7 @@ private function testSelectExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.type, SUM(r.year-1000) age ' .
-            'FROM Phalcon\Test\Models\Robots r GROUP BY 1 ORDER BY 2 DESC'
+            'FROM Phalcon\Tests\Models\Robots r GROUP BY 1 ORDER BY 2 DESC'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -315,7 +315,7 @@ private function testSelectExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.type, COUNT(*) number ' .
-            'FROM Phalcon\Test\Models\Robots r GROUP BY 1 HAVING COUNT(*) = 2'
+            'FROM Phalcon\Tests\Models\Robots r GROUP BY 1 HAVING COUNT(*) = 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(1, $result);
@@ -324,7 +324,7 @@ private function testSelectExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.type, COUNT(*) number ' .
-            'FROM Phalcon\Test\Models\Robots r GROUP BY 1 HAVING COUNT(*) < 2'
+            'FROM Phalcon\Tests\Models\Robots r GROUP BY 1 HAVING COUNT(*) < 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -332,7 +332,7 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(1, $result[0]->number);
 
         $result = $manager->executeQuery(
-            'SELECT r.id, r.* FROM Phalcon\Test\Models\Robots r'
+            'SELECT r.id, r.* FROM Phalcon\Tests\Models\Robots r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         /**
@@ -344,13 +344,13 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(1, $result[0]->id);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.*, Phalcon\Test\Models\RobotsParts.* ' .
-            'FROM Phalcon\Test\Models\Robots JOIN Phalcon\Test\Models\RobotsParts ' .
-            'ORDER BY Phalcon\Test\Models\Robots.id, Phalcon\Test\Models\RobotsParts.id'
+            'SELECT Phalcon\Tests\Models\Robots.*, Phalcon\Tests\Models\RobotsParts.* ' .
+            'FROM Phalcon\Tests\Models\Robots JOIN Phalcon\Tests\Models\RobotsParts ' .
+            'ORDER BY Phalcon\Tests\Models\Robots.id, Phalcon\Tests\Models\RobotsParts.id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertTrue(is_object($result[0]->robots));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $result[0]->robots);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $result[0]->robots);
         $I->assertTrue(is_object($result[0]->robotsParts));
         $I->assertInstanceOf(\RobotsParts::class, $result[0]->robotsParts);
         $I->assertCount(3, $result);
@@ -360,14 +360,14 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[1]->robotsParts->id);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robots.*, Phalcon\Test\Models\RobotsParts.* ' .
-            'FROM Phalcon\Test\Models\Robots JOIN Phalcon\Test\Models\RobotsParts ' .
-            'ON Phalcon\Test\Models\Robots.id = Phalcon\Test\Models\RobotsParts.robots_id ' .
-            'ORDER BY Phalcon\Test\Models\Robots.id, Phalcon\Test\Models\RobotsParts.id'
+            'SELECT Phalcon\Tests\Models\Robots.*, Phalcon\Tests\Models\RobotsParts.* ' .
+            'FROM Phalcon\Tests\Models\Robots JOIN Phalcon\Tests\Models\RobotsParts ' .
+            'ON Phalcon\Tests\Models\Robots.id = Phalcon\Tests\Models\RobotsParts.robots_id ' .
+            'ORDER BY Phalcon\Tests\Models\Robots.id, Phalcon\Tests\Models\RobotsParts.id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertTrue(is_object($result[0]->robots));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $result[0]->robots);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $result[0]->robots);
         $I->assertTrue(is_object($result[0]->robotsParts));
         $I->assertInstanceOf('RobotsParts', $result[0]->robotsParts);
         $I->assertCount(3, $result);
@@ -378,14 +378,14 @@ private function testSelectExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.*, p.* ' .
-            'FROM Phalcon\Test\Models\Robots r ' .
-            'JOIN Phalcon\Test\Models\RobotsParts p ON r.id = p.robots_id ORDER BY r.id, p.id'
+            'FROM Phalcon\Tests\Models\Robots r ' .
+            'JOIN Phalcon\Tests\Models\RobotsParts p ON r.id = p.robots_id ORDER BY r.id, p.id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertTrue(is_object($result[0]->r));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots::class, $result[0]->r);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots::class, $result[0]->r);
         $I->assertTrue(is_object($result[0]->p));
-        $I->assertInstanceOf(\Phalcon\Test\Models\RobotsParts::class, $result[0]->p);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\RobotsParts::class, $result[0]->p);
         $I->assertCount(3, $result);
         $I->assertEquals($result[0]->r->id, 1);
         $I->assertEquals($result[0]->p->id, 1);
@@ -397,21 +397,21 @@ private function testSelectExecute(IntegrationTester $I)
          * @todo - check this
          */
 //        $result = $manager->executeQuery(
-//            'SELECT Phalcon\Test\Models\Some\Robots.*, Phalcon\Test\Models\Some\RobotsParts.* ' .
-//            'FROM Phalcon\Test\Models\Some\Robots JOIN Phalcon\Test\Models\Some\RobotsParts ' .
-//            'ON Phalcon\Test\Models\Some\Robots.id = Phalcon\Test\Models\Some\RobotsParts.robots_id ' .
-//            'ORDER BY Phalcon\Test\Models\Some\Robots.id, Phalcon\Test\Models\Some\RobotsParts.id'
+//            'SELECT Phalcon\Tests\Models\Some\Robots.*, Phalcon\Tests\Models\Some\RobotsParts.* ' .
+//            'FROM Phalcon\Tests\Models\Some\Robots JOIN Phalcon\Tests\Models\Some\RobotsParts ' .
+//            'ON Phalcon\Tests\Models\Some\Robots.id = Phalcon\Tests\Models\Some\RobotsParts.robots_id ' .
+//            'ORDER BY Phalcon\Tests\Models\Some\Robots.id, Phalcon\Tests\Models\Some\RobotsParts.id'
 //        );
 //        $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
-//        $I->assertInternalType('object', $result[0]->{\Phalcon\Test\Models\Some\Robots::class});
+//        $I->assertInternalType('object', $result[0]->{\Phalcon\Tests\Models\Some\Robots::class});
 //        $I->assertInstanceOf(
-//          \Phalcon\Test\Models\Robots::class,
-//          $result[0]->{\Phalcon\Test\Models\Some\Robots::class}
+//          \Phalcon\Tests\Models\Robots::class,
+//          $result[0]->{\Phalcon\Tests\Models\Some\Robots::class}
 //        );
-//        $I->assertInternalType('object', $result[0]->{\Phalcon\Test\Models\Some\RobotsParts::class});
+//        $I->assertInternalType('object', $result[0]->{\Phalcon\Tests\Models\Some\RobotsParts::class});
 //        $I->assertInstanceOf(
-//          \Phalcon\Test\Models\RobotsParts::class,
-//           $result[0]->{\Phalcon\Test\Models\Some\RobotsParts::class}
+//          \Phalcon\Tests\Models\RobotsParts::class,
+//           $result[0]->{\Phalcon\Tests\Models\Some\RobotsParts::class}
 //        );
 //        $I->assertCount(3, $result);
 //        $I->assertEquals($result[0]->{'some\Robots'}->id, 1);
@@ -422,15 +422,15 @@ private function testSelectExecute(IntegrationTester $I)
         /** Joins with namespaces and aliases */
         $result = $manager->executeQuery(
             'SELECT r.*, p.* ' .
-            'FROM Phalcon\Test\Models\Some\Robots r ' .
-            'JOIN Phalcon\Test\Models\Some\RobotsParts p ON r.id = p.robots_id ' .
+            'FROM Phalcon\Tests\Models\Some\Robots r ' .
+            'JOIN Phalcon\Tests\Models\Some\RobotsParts p ON r.id = p.robots_id ' .
             'ORDER BY r.id, p.id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertTrue(is_object($result[0]->r));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Some\Robots::class, $result[0]->r);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Some\Robots::class, $result[0]->r);
         $I->assertTrue(is_object($result[0]->p));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Some\RobotsParts::class, $result[0]->p);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Some\RobotsParts::class, $result[0]->p);
         $I->assertCount(3, $result);
         $I->assertEquals(1, $result[0]->r->id);
         $I->assertEquals(1, $result[0]->p->id);
@@ -438,28 +438,28 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertEquals(2, $result[1]->p->id);
 
         $result = $manager->executeQuery(
-            'SELECT id, name FROM Phalcon\Test\Models\Some\Robots'
+            'SELECT id, name FROM Phalcon\Tests\Models\Some\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT id, name FROM Phalcon\Test\Models\Some\Robots ORDER BY name DESC LIMIT 2'
+            'SELECT id, name FROM Phalcon\Tests\Models\Some\Robots ORDER BY name DESC LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT ALL estado FROM Phalcon\Test\Models\Personas LIMIT 2'
+            'SELECT ALL estado FROM Phalcon\Tests\Models\Personas LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT DISTINCT estado FROM Phalcon\Test\Models\Personas'
+            'SELECT DISTINCT estado FROM Phalcon\Tests\Models\Personas'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         /**
@@ -469,7 +469,7 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT count(DISTINCT estado) FROM Phalcon\Test\Models\Personas'
+            'SELECT count(DISTINCT estado) FROM Phalcon\Tests\Models\Personas'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertCount(1, $result);
@@ -480,19 +480,19 @@ private function testSelectExecute(IntegrationTester $I)
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT CASE 1 WHEN 1 THEN 2 END FROM Phalcon\Test\Models\Robots'
+            'SELECT CASE 1 WHEN 1 THEN 2 END FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertEquals(2, $result[0]->{'0'});
 
         $result = $manager->executeQuery(
-            'SELECT CASE 2 WHEN 1 THEN 2 WHEN 2 THEN 3 END FROM Phalcon\Test\Models\Robots'
+            'SELECT CASE 2 WHEN 1 THEN 2 WHEN 2 THEN 3 END FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertEquals(3, $result[0]->{'0'});
 
         $result = $manager->executeQuery(
-            'SELECT CASE 2 WHEN 1 THEN 2 ELSE 3 END FROM Phalcon\Test\Models\Robots'
+            'SELECT CASE 2 WHEN 1 THEN 2 ELSE 3 END FROM Phalcon\Tests\Models\Robots'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertEquals(3, $result[0]->{'0'});
@@ -514,81 +514,81 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $manager = $this->container->getShared('modelsManager');
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
         $I->assertCount(3, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters ORDER BY 1'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters ORDER BY 1'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
         $I->assertCount(3, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertEquals($robotters[0]->code, 1);
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters ORDER BY code'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters ORDER BY code'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
         $I->assertCount(3, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertEquals($robotters[0]->code, 1);
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters ORDER BY Phalcon\Test\Models\Robotters.code'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters ORDER BY Phalcon\Tests\Models\Robotters.code'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
         $I->assertCount(3, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertEquals($robotters[0]->code, 1);
 
         $robotters = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.* FROM Phalcon\Test\Models\Robotters'
+            'SELECT Phalcon\Tests\Models\Robotters.* FROM Phalcon\Tests\Models\Robotters'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertCount(3, $robotters);
 
         $robotters = $manager->executeQuery(
-            'SELECT r.* FROM Phalcon\Test\Models\Robotters r'
+            'SELECT r.* FROM Phalcon\Tests\Models\Robotters r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertCount(3, $robotters);
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters r'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertCount(3, $robotters);
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters AS r'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters AS r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertCount(3, $robotters);
 
         $robotters = $manager->executeQuery(
-            'SELECT * FROM Phalcon\Test\Models\Robotters AS r'
+            'SELECT * FROM Phalcon\Tests\Models\Robotters AS r'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robotters);
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $robotters[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $robotters[0]);
         $I->assertCount(3, $robotters);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.theName FROM Phalcon\Test\Models\Robotters'
+            'SELECT Phalcon\Tests\Models\Robotters.theName FROM Phalcon\Tests\Models\Robotters'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT LENGTH(Phalcon\Test\Models\Robotters.theName) AS the_length ' .
-            'FROM Phalcon\Test\Models\Robotters'
+            'SELECT LENGTH(Phalcon\Tests\Models\Robotters.theName) AS the_length ' .
+            'FROM Phalcon\Tests\Models\Robotters'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
@@ -597,8 +597,8 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->the_length, 8);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters WHERE code = 1'
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters WHERE code = 1'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(1, $result);
@@ -607,8 +607,8 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->nextId, 2);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters WHERE code = ?0',
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters WHERE code = ?0',
             [
                 0 => 1,
             ]
@@ -620,8 +620,8 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->nextId, 2);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters WHERE code = :code:',
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters WHERE code = :code:',
             [
                 'code' => 1,
             ]
@@ -633,8 +633,8 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->nextId, 2);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters WHERE code = "1"'
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters WHERE code = "1"'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(1, $result);
@@ -644,15 +644,15 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theYear ' .
-            'FROM Phalcon\Test\Models\Robotters r WHERE TRIM(theName) != "Robotina"'
+            'FROM Phalcon\Tests\Models\Robotters r WHERE TRIM(theName) != "Robotina"'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters ORDER BY code'
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters ORDER BY code'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -661,8 +661,8 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->nextId, 2);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters ORDER BY code LIMIT 2'
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters ORDER BY code LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -671,8 +671,8 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->nextId, 2);
 
         $result = $manager->executeQuery(
-            'SELECT Phalcon\Test\Models\Robotters.code+1 AS nextId ' .
-            'FROM Phalcon\Test\Models\Robotters ORDER BY code DESC LIMIT 2'
+            'SELECT Phalcon\Tests\Models\Robotters.code+1 AS nextId ' .
+            'FROM Phalcon\Tests\Models\Robotters ORDER BY code DESC LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
@@ -681,7 +681,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
         $I->assertEquals($result[0]->nextId, 4);
 
         $result = $manager->executeQuery(
-            'SELECT r.theName FROM Phalcon\Test\Models\Robotters r ORDER BY r.theName DESC LIMIT 2'
+            'SELECT r.theName FROM Phalcon\Tests\Models\Robotters r ORDER BY r.theName DESC LIMIT 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -691,7 +691,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theName le_theName ' .
-            'FROM Phalcon\Test\Models\Robotters r ORDER BY r.theName ASC LIMIT 4'
+            'FROM Phalcon\Tests\Models\Robotters r ORDER BY r.theName ASC LIMIT 4'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(3, $result);
@@ -701,7 +701,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theName le_theName ' .
-            'FROM Phalcon\Test\Models\Robotters r ORDER BY r.theName ASC LIMIT 1,2'
+            'FROM Phalcon\Tests\Models\Robotters r ORDER BY r.theName ASC LIMIT 1,2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -711,7 +711,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theName le_theName ' .
-            'FROM Phalcon\Test\Models\Robotters r ORDER BY r.theName ASC LIMIT 2 OFFSET 1'
+            'FROM Phalcon\Tests\Models\Robotters r ORDER BY r.theName ASC LIMIT 2 OFFSET 1'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -721,7 +721,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theType, COUNT(*) number ' .
-            'FROM Phalcon\Test\Models\Robotters r GROUP BY 1 ORDER BY r.theType ASC'
+            'FROM Phalcon\Tests\Models\Robotters r GROUP BY 1 ORDER BY r.theType ASC'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -730,7 +730,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theType, SUM(r.theYear-1000) age ' .
-            'FROM Phalcon\Test\Models\Robotters r GROUP BY 1 ORDER BY 2 DESC'
+            'FROM Phalcon\Tests\Models\Robotters r GROUP BY 1 ORDER BY 2 DESC'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(2, $result);
@@ -739,7 +739,7 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theType, COUNT(*) number ' .
-            'FROM Phalcon\Test\Models\Robotters r GROUP BY 1 HAVING COUNT(*) = 2'
+            'FROM Phalcon\Tests\Models\Robotters r GROUP BY 1 HAVING COUNT(*) = 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertCount(1, $result);
@@ -748,14 +748,14 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.theType, COUNT(*) number ' .
-            'FROM Phalcon\Test\Models\Robotters r GROUP BY 1 HAVING COUNT(*) < 2'
+            'FROM Phalcon\Tests\Models\Robotters r GROUP BY 1 HAVING COUNT(*) < 2'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Row::class, $result[0]);
         $I->assertCount(1, $result);
         $I->assertEquals($result[0]->number, 1);
 
-        $result = $manager->executeQuery('SELECT r.code, r.* FROM Phalcon\Test\Models\Robotters r');
+        $result = $manager->executeQuery('SELECT r.code, r.* FROM Phalcon\Tests\Models\Robotters r');
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         /**
          * @todo Check this
@@ -769,16 +769,16 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 //        $I->assertEquals($result[0]->code, 1);
 //
 //        $result = $manager->executeQuery(
-//            'SELECT Phalcon\Test\Models\Robotters.*, Phalcon\Test\Models\RobottersDeles.* ' .
-//            'FROM Phalcon\Test\Models\Robotters ' .
-//            'JOIN Phalcon\Test\Models\RobottersDeles ' .
-//            'ORDER BY Phalcon\Test\Models\Robotters.code, Phalcon\Test\Models\RobottersDeles.code'
+//            'SELECT Phalcon\Tests\Models\Robotters.*, Phalcon\Tests\Models\RobottersDeles.* ' .
+//            'FROM Phalcon\Tests\Models\Robotters ' .
+//            'JOIN Phalcon\Tests\Models\RobottersDeles ' .
+//            'ORDER BY Phalcon\Tests\Models\Robotters.code, Phalcon\Tests\Models\RobottersDeles.code'
 //        );
 //        $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
 //        $I->assertInternalType('object', $result[0]->robotters);
-//        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $result[0]->robotters);
+//        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $result[0]->robotters);
 //        $I->assertInternalType('object', $result[0]->robottersDeles);
-//        $I->assertInstanceOf(\Phalcon\Test\Models\RobottersDeles::class, $result[0]->robottersDeles);
+//        $I->assertInstanceOf(\Phalcon\Tests\Models\RobottersDeles::class, $result[0]->robottersDeles);
 //        $I->assertCount(3, $result);
 //        $I->assertEquals($result[0]->robotters->code, 1);
 //        $I->assertEquals($result[0]->robottersDeles->code, 1);
@@ -786,15 +786,15 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 //        $I->assertEquals($result[1]->robottersDeles->code, 2);
 //
 //        $result = $manager->executeQuery(
-//            'SELECT Phalcon\Test\Models\Robotters.*, Phalcon\Test\Models\RobottersDeles.* ' .
-//            'FROM Phalcon\Test\Models\Robotters ' .
-//            'JOIN Phalcon\Test\Models\RobottersDeles ' .
-//            'ON Phalcon\Test\Models\Robotters.code = Phalcon\Test\Models\RobottersDeles.robottersCode ' .
-//            'ORDER BY Phalcon\Test\Models\Robotters.code, Phalcon\Test\Models\RobottersDeles.code'
+//            'SELECT Phalcon\Tests\Models\Robotters.*, Phalcon\Tests\Models\RobottersDeles.* ' .
+//            'FROM Phalcon\Tests\Models\Robotters ' .
+//            'JOIN Phalcon\Tests\Models\RobottersDeles ' .
+//            'ON Phalcon\Tests\Models\Robotters.code = Phalcon\Tests\Models\RobottersDeles.robottersCode ' .
+//            'ORDER BY Phalcon\Tests\Models\Robotters.code, Phalcon\Tests\Models\RobottersDeles.code'
 //        );
 //        $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
 //        $I->assertInternalType('object', $result[0]->robotters);
-//        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $result[0]->robotters);
+//        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $result[0]->robotters);
 //        $I->assertInternalType('object', $result[0]->robottersDeles);
 //        $I->assertInstanceOf('RobottersDeles', $result[0]->robottersDeles);
 //        $I->assertCount(3, $result);
@@ -805,16 +805,16 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.*, p.* ' .
-            'FROM Phalcon\Test\Models\Robotters r ' .
-            'JOIN Phalcon\Test\Models\RobottersDeles p ' .
+            'FROM Phalcon\Tests\Models\Robotters r ' .
+            'JOIN Phalcon\Tests\Models\RobottersDeles p ' .
             'ON r.code = p.robottersCode ' .
             'ORDER BY r.code, p.code'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
         $I->assertTrue(is_object($result[0]->r));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robotters::class, $result[0]->r);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robotters::class, $result[0]->r);
         $I->assertTrue(is_object($result[0]->p));
-        $I->assertInstanceOf(\Phalcon\Test\Models\RobottersDeles::class, $result[0]->p);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\RobottersDeles::class, $result[0]->p);
         $I->assertCount(3, $result);
         $I->assertEquals($result[0]->r->code, 1);
         $I->assertEquals($result[0]->p->code, 1);
@@ -823,37 +823,37 @@ private function testSelectRenamedExecute(IntegrationTester $I)
 
         $result = $manager->executeQuery(
             'SELECT r.* ' .
-            'FROM Phalcon\Test\Models\RobotsParts rp ' .
-            'LEFT JOIN Phalcon\Test\Models\Robots2 r ON rp.robots_id=r.id'
+            'FROM Phalcon\Tests\Models\RobotsParts rp ' .
+            'LEFT JOIN Phalcon\Tests\Models\Robots2 r ON rp.robots_id=r.id'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
         $I->assertTrue(is_object($result[0]));
-        $I->assertInstanceOf(\Phalcon\Test\Models\Robots2::class, $result[0]);
+        $I->assertInstanceOf(\Phalcon\Tests\Models\Robots2::class, $result[0]);
         $I->assertNotNull($result[0]->getName());
 
         $result = $manager->executeQuery(
             'SELECT r.* ' .
-            'FROM Phalcon\Test\Models\Robots r ' .
+            'FROM Phalcon\Tests\Models\Robots r ' .
             'WHERE r.id NOT IN (SELECT p.id ' .
-            'FROM Phalcon\Test\Models\Parts p WHERE r.id < p.id)'
+            'FROM Phalcon\Tests\Models\Parts p WHERE r.id < p.id)'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $result);
 
         $result = $manager->executeQuery(
             'SELECT * ' .
-            'FROM Phalcon\Test\Models\Robots r ' .
-            'JOIN Phalcon\Test\Models\RobotsParts rp ' .
+            'FROM Phalcon\Tests\Models\Robots r ' .
+            'JOIN Phalcon\Tests\Models\RobotsParts rp ' .
             'WHERE rp.id IN (SELECT p.id ' .
-            'FROM Phalcon\Test\Models\Parts p WHERE rp.parts_id = p.id)'
+            'FROM Phalcon\Tests\Models\Parts p WHERE rp.parts_id = p.id)'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
 
         $result = $manager->executeQuery(
             'SELECT * ' .
-            'FROM Phalcon\Test\Models\Robots r ' .
-            'JOIN Phalcon\Test\Models\RobotsParts rp ' .
+            'FROM Phalcon\Tests\Models\Robots r ' .
+            'JOIN Phalcon\Tests\Models\RobotsParts rp ' .
             'WHERE r.id IN (SELECT p.id ' .
-            'FROM Phalcon\Test\Models\Parts p)'
+            'FROM Phalcon\Tests\Models\Parts p)'
         );
         $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Complex::class, $result);
     }
@@ -865,7 +865,7 @@ private function testInsertExecute(IntegrationTester $I)
         $this->container->getShared('db')->delete('subscriptores');
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Subscriptores ' .
+            'INSERT INTO Phalcon\Tests\Models\Subscriptores ' .
             'VALUES (NULL, "marina@hotmail.com", "2011-01-01 09:01:01", "P")'
         );
         $I->assertFalse($status->success());
@@ -877,7 +877,7 @@ private function testInsertExecute(IntegrationTester $I)
         $I->assertEquals([], $messages[0]->getMetaData());
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Subscriptores ' .
+            'INSERT INTO Phalcon\Tests\Models\Subscriptores ' .
             'VALUES (NULL, "dtmail.com", "2011-01-01 09:01:01", "P")'
         );
         $I->assertFalse($status->success());
@@ -889,25 +889,25 @@ private function testInsertExecute(IntegrationTester $I)
         $I->assertEquals([], $messages[0]->getMetaData());
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Subscriptores ' .
+            'INSERT INTO Phalcon\Tests\Models\Subscriptores ' .
             'VALUES (NULL, "le-marina@hotmail.com", "2011-01-01 09:01:01", "P")'
         );
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Subscriptores ' .
+            'INSERT INTO Phalcon\Tests\Models\Subscriptores ' .
             'VALUES (NULL, "sonny@hotmail.com", "2010-01-01 13:21:00", "P")'
         );
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Subscriptores (email, created_at, status) ' .
+            'INSERT INTO Phalcon\Tests\Models\Subscriptores (email, created_at, status) ' .
             'VALUES ("hideaway@hotmail.com", "2010-01-01 13:21:00", "P")'
         );
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Subscriptores (email, created_at, status) ' .
+            'INSERT INTO Phalcon\Tests\Models\Subscriptores (email, created_at, status) ' .
             'VALUES (:email:, :created_at:, :status:)',
             [
                 'email'      => 'yeahyeah@hotmail.com',
@@ -933,7 +933,7 @@ private function testInsertRenamedExecute(IntegrationTester $I)
          * This test must fail because the email is not allowed as a model business rule
          */
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Abonnes ' .
+            'INSERT INTO Phalcon\Tests\Models\Abonnes ' .
             'VALUES (NULL, "marina@hotmail.com", "2011-01-01 09:01:01", "P")'
         );
         $I->assertFalse($status->success());
@@ -949,7 +949,7 @@ private function testInsertRenamedExecute(IntegrationTester $I)
          * This test must fail because the email is invalid
          */
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Abonnes ' .
+            'INSERT INTO Phalcon\Tests\Models\Abonnes ' .
             'VALUES (NULL, "dtmail.com", "2011-01-01 09:01:01", "P")'
         );
         $I->assertFalse($status->success());
@@ -964,7 +964,7 @@ private function testInsertRenamedExecute(IntegrationTester $I)
          * This test must pass
          */
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Abonnes ' .
+            'INSERT INTO Phalcon\Tests\Models\Abonnes ' .
             'VALUES (NULL, "le-marina@hotmail.com", "2011-01-01 09:01:01", "P")'
         );
         $I->assertTrue($status->success());
@@ -973,7 +973,7 @@ private function testInsertRenamedExecute(IntegrationTester $I)
          * This test must pass
          */
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Abonnes ' .
+            'INSERT INTO Phalcon\Tests\Models\Abonnes ' .
             'VALUES (NULL, "sonny@hotmail.com", "2010-01-01 13:21:00", "P")'
         );
         $I->assertTrue($status->success());
@@ -982,13 +982,13 @@ private function testInsertRenamedExecute(IntegrationTester $I)
          * This test must pass
          */
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Abonnes (courrierElectronique, creeA, statut) ' .
+            'INSERT INTO Phalcon\Tests\Models\Abonnes (courrierElectronique, creeA, statut) ' .
             'VALUES ("hideaway@hotmail.com", "2010-01-01 13:21:00", "P")'
         );
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'INSERT INTO Phalcon\Test\Models\Abonnes (courrierElectronique, creeA, statut) ' .
+            'INSERT INTO Phalcon\Tests\Models\Abonnes (courrierElectronique, creeA, statut) ' .
             'VALUES (:courrierElectronique:, :creeA:, :statut:)',
             [
                 'courrierElectronique' => 'yeahyeah@hotmail.com',
@@ -1014,13 +1014,13 @@ private function testUpdateExecute(IntegrationTester $I)
         ;
 
         $status = $manager->executeQuery(
-            "UPDATE Phalcon\Test\Models\People SET direccion = 'COL' ' .
+            "UPDATE Phalcon\Tests\Models\People SET direccion = 'COL' ' .
             'WHERE ciudad_id IS NULL LIMIT 25"
         );
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'UPDATE Phalcon\Test\Models\People SET direccion = :direccion: ' .
+            'UPDATE Phalcon\Tests\Models\People SET direccion = :direccion: ' .
             'WHERE ciudad_id IS NULL LIMIT 25',
             [
                 'direccion' => 'MXN',
@@ -1029,7 +1029,7 @@ private function testUpdateExecute(IntegrationTester $I)
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'UPDATE Phalcon\Test\Models\Subscriptores SET status = :status: WHERE email = :email:',
+            'UPDATE Phalcon\Tests\Models\Subscriptores SET status = :status: WHERE email = :email:',
             [
                 'status' => 'I',
                 'email'  => 'le-marina@hotmail.com',
@@ -1061,13 +1061,13 @@ private function testUpdateRenamedExecute(IntegrationTester $I)
         ;
 
         $status = $manager->executeQuery(
-            "UPDATE Phalcon\Test\Models\Personers SET adresse = 'COL' ' .
+            "UPDATE Phalcon\Tests\Models\Personers SET adresse = 'COL' ' .
             'WHERE fodebyId IS NULL LIMIT 25"
         );
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'UPDATE Phalcon\Test\Models\Personers SET adresse = :adresse: ' .
+            'UPDATE Phalcon\Tests\Models\Personers SET adresse = :adresse: ' .
             'WHERE fodebyId IS NULL LIMIT 25',
             [
                 'adresse' => 'MXN',
@@ -1076,7 +1076,7 @@ private function testUpdateRenamedExecute(IntegrationTester $I)
         $I->assertTrue($status->success());
 
         $status = $manager->executeQuery(
-            'UPDATE Phalcon\Test\Models\Abonnes SET statut = :statut: ' .
+            'UPDATE Phalcon\Tests\Models\Abonnes SET statut = :statut: ' .
             'WHERE courrierElectronique = :courrierElectronique:',
             [
                 'statut'               => 'I',
@@ -1091,7 +1091,7 @@ private function testDeleteExecute(IntegrationTester $I)
         $manager = $this->container->getShared('modelsManager');
 
         $status = $manager->executeQuery(
-            'DELETE FROM Phalcon\Test\Models\Subscriptores ' .
+            'DELETE FROM Phalcon\Tests\Models\Subscriptores ' .
             'WHERE email = "marina@hotmail.com"'
         );
 
@@ -1101,7 +1101,7 @@ private function testDeleteExecute(IntegrationTester $I)
 
 
         $status = $manager->executeQuery(
-            'DELETE FROM Phalcon\Test\Models\Subscriptores ' .
+            'DELETE FROM Phalcon\Tests\Models\Subscriptores ' .
             'WHERE status = :status: AND email <> :email:',
             [
                 'status' => 'P',
@@ -1132,7 +1132,7 @@ private function testDeleteRenamedExecute(IntegrationTester $I)
         $manager = $this->container->getShared('modelsManager');
 
         $status = $manager->executeQuery(
-            'DELETE FROM Phalcon\Test\Models\Abonnes ' .
+            'DELETE FROM Phalcon\Tests\Models\Abonnes ' .
             'WHERE courrierElectronique = "marina@hotmail.com"'
         );
 
@@ -1142,7 +1142,7 @@ private function testDeleteRenamedExecute(IntegrationTester $I)
 
 
         $status = $manager->executeQuery(
-            'DELETE FROM Phalcon\Test\Models\Abonnes ' .
+            'DELETE FROM Phalcon\Tests\Models\Abonnes ' .
             'WHERE statut = :statut: AND courrierElectronique <> :courrierElectronique:',
             [
                 'statut'               => 'P',
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsCest.php
index edcbb3e0d12..45342a259f9 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsCest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Relations\Deles;
-use Phalcon\Test\Models\Relations\M2MParts;
-use Phalcon\Test\Models\Relations\M2MRobots;
-use Phalcon\Test\Models\Relations\RelationsRobots;
-use Phalcon\Test\Models\Relations\Robotters;
-use Phalcon\Test\Models\Relations\RobottersDeles;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Relations\Deles;
+use Phalcon\Tests\Models\Relations\M2MParts;
+use Phalcon\Tests\Models\Relations\M2MRobots;
+use Phalcon\Tests\Models\Relations\RelationsRobots;
+use Phalcon\Tests\Models\Relations\Robotters;
+use Phalcon\Tests\Models\Relations\RobottersDeles;
 
 class ModelsRelationsCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsMagicCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsMagicCest.php
index 6e588867e56..b60e66b5642 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsMagicCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsRelationsMagicCest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\AlbumORama\Albums;
-use Phalcon\Test\Models\AlbumORama\Artists;
-use Phalcon\Test\Models\AlbumORama\Songs;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\AlbumORama\Albums;
+use Phalcon\Tests\Models\AlbumORama\Artists;
+use Phalcon\Tests\Models\AlbumORama\Songs;
 
 class ModelsRelationsMagicCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheCest.php
index 2e565865170..160ce55d545 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheCest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Cache\Backend\File;
 use Phalcon\Cache\Frontend\Data;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function cacheDir;
 
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheStaticCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheStaticCest.php
index 9fd3bfb750d..23ff4a3f534 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheStaticCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCacheStaticCest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Cacheable\Parts;
-use Phalcon\Test\Models\Cacheable\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Cacheable\Parts;
+use Phalcon\Tests\Models\Cacheable\Robots;
 
 use function cacheDir;
 
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php
index 79fefc6372e..0699e5eb2e8 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use AppendIterator;
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Personas;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Personas;
+use Phalcon\Tests\Models\Robots;
 
 class ModelsResultsetCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsValidatorsCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsValidatorsCest.php
index 6c1f7847faa..e7f26561623 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsValidatorsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsValidatorsCest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Abonnes;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Abonnes;
 use Phalcon\Validation\Validator\Email;
 use Phalcon\Validation\Validator\ExclusionIn;
 use Phalcon\Validation\Validator\InclusionIn;
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-QueryOldCest.php b/tests/tocheck-database/Mvc/Model/Refactor-QueryOldCest.php
index 84756e889ab..5a28368124b 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-QueryOldCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-QueryOldCest.php
@@ -9,23 +9,23 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Deles;
-use Phalcon\Test\Models\Parts;
-use Phalcon\Test\Models\People;
-use Phalcon\Test\Models\Personers;
-use Phalcon\Test\Models\Products;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\RobotsParts;
-use Phalcon\Test\Models\Robotters;
-use Phalcon\Test\Models\RobottersDeles;
-use Phalcon\Test\Models\Some\Products as SomeProducts;
-use Phalcon\Test\Models\Some\Robotters as SomeRobotters;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Deles;
+use Phalcon\Tests\Models\Parts;
+use Phalcon\Tests\Models\People;
+use Phalcon\Tests\Models\Personers;
+use Phalcon\Tests\Models\Products;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\RobotsParts;
+use Phalcon\Tests\Models\Robotters;
+use Phalcon\Tests\Models\RobottersDeles;
+use Phalcon\Tests\Models\Some\Products as SomeProducts;
+use Phalcon\Tests\Models\Some\Robotters as SomeRobotters;
 
 class QueryOldCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-RelationsCest.php b/tests/tocheck-database/Mvc/Model/Refactor-RelationsCest.php
index 7349176e453..0bfef839786 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-RelationsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-RelationsCest.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\AlbumORama\Albums;
-use Phalcon\Test\Models\AlbumORama\Artists;
-use Phalcon\Test\Models\Language;
-use Phalcon\Test\Models\LanguageI18n;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\AlbumORama\Albums;
+use Phalcon\Tests\Models\AlbumORama\Artists;
+use Phalcon\Tests\Models\Language;
+use Phalcon\Tests\Models\LanguageI18n;
 
 class RelationsCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ResultsetClassCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ResultsetClassCest.php
index e30caaf58c8..0810aa7d550 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ResultsetClassCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ResultsetClassCest.php
@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Statistics\AgeStats;
-use Phalcon\Test\Models\Statistics\CityStats;
-use Phalcon\Test\Models\Statistics\CountryStats;
-use Phalcon\Test\Models\Statistics\GenderStats;
-use Phalcon\Test\Resultsets\Stats;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Statistics\AgeStats;
+use Phalcon\Tests\Models\Statistics\CityStats;
+use Phalcon\Tests\Models\Statistics\CountryStats;
+use Phalcon\Tests\Models\Statistics\GenderStats;
+use Phalcon\Tests\Resultsets\Stats;
 
 class ResultsetClassCest
 {
@@ -74,7 +74,7 @@ public function testExceptionOnBadInterface(IntegrationTester $I)
     {
         $I->expectThrowable(
             new Exception(
-                'Resultset class "Phalcon\Test\Models\Statistics\AgeStats" must ' .
+                'Resultset class "Phalcon\Tests\Models\Statistics\AgeStats" must ' .
                 'be an implementation of Phalcon\Mvc\Model\ResultsetInterface'
             ),
             function () {
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-SnapshotCest.php b/tests/tocheck-database/Mvc/Model/Refactor-SnapshotCest.php
index 9a5e3d767d5..446ff6c256e 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-SnapshotCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-SnapshotCest.php
@@ -9,18 +9,18 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use DateTime;
 use IntegrationTester;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Snapshot\Personas;
-use Phalcon\Test\Models\Snapshot\Requests;
-use Phalcon\Test\Models\Snapshot\Robots;
-use Phalcon\Test\Models\Snapshot\Robotters;
-use Phalcon\Test\Models\Snapshot\Subscribers;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Snapshot\Personas;
+use Phalcon\Tests\Models\Snapshot\Requests;
+use Phalcon\Tests\Models\Snapshot\Robots;
+use Phalcon\Tests\Models\Snapshot\Robotters;
+use Phalcon\Tests\Models\Snapshot\Subscribers;
 
 class SnapshotCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Relation/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Relation/ConstructCest.php
index 4dac1294dbb..5d42e227e92 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetFieldsCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetFieldsCest.php
index 9f1abde642d..0a55fa7ae17 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetFieldsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetFieldsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetForeignKeyCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetForeignKeyCest.php
index ee48e165fbe..5125d51d2fc 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetForeignKeyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateFieldsCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateFieldsCest.php
index 779655fd5a5..064d0f7b0ea 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateFieldsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateFieldsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateModelCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateModelCest.php
index 78ab3f80c39..757b47f6588 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateModelCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateModelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateReferencedFieldsCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateReferencedFieldsCest.php
index c205792fadf..ebd7ba89c47 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateReferencedFieldsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetIntermediateReferencedFieldsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetOptionCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetOptionCest.php
index 0cc187c4d73..4191ff0d490 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetOptionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetOptionsCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetOptionsCest.php
index e094115519d..454e3678f43 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetOptionsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetParamsCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetParamsCest.php
index 86b346e6a09..be8ed39c772 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetParamsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetReferencedFieldsCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetReferencedFieldsCest.php
index 4dced8e2375..b4adb6cf409 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetReferencedFieldsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetReferencedFieldsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetReferencedModelCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetReferencedModelCest.php
index b08222e7dbe..4094c186ac2 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetReferencedModelCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetReferencedModelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/GetTypeCest.php b/tests/tocheck-database/Mvc/Model/Relation/GetTypeCest.php
index 13df9b09ba5..58d2cd0bb7c 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/GetTypeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/IsForeignKeyCest.php b/tests/tocheck-database/Mvc/Model/Relation/IsForeignKeyCest.php
index b0b4a386874..ff55e379cc3 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/IsForeignKeyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/IsForeignKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Relation;
diff --git a/tests/tocheck-database/Mvc/Model/Relation/IsReusableCest.php b/tests/tocheck-database/Mvc/Model/Relation/IsReusableCest.php
index f959564c48b..ad4ce0c3e97 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/IsReusableCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/IsReusableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/IsThroughCest.php b/tests/tocheck-database/Mvc/Model/Relation/IsThroughCest.php
index 7fe11e66fa0..b8bb651eb63 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/IsThroughCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/IsThroughCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Relation/SetIntermediateRelationCest.php b/tests/tocheck-database/Mvc/Model/Relation/SetIntermediateRelationCest.php
index ae929486078..e0a15de6a0c 100644
--- a/tests/tocheck-database/Mvc/Model/Relation/SetIntermediateRelationCest.php
+++ b/tests/tocheck-database/Mvc/Model/Relation/SetIntermediateRelationCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Relation;
+namespace Phalcon\Tests\Integration\Mvc\Model\Relation;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/ConstructCest.php
index 1b81f10da18..9d9a43db9f6 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/CountCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/CountCest.php
index bd603a9e9f6..3f9ebbaec75 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/CountCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/CurrentCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/CurrentCest.php
index df98165dd0e..d9fce476fd1 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/CurrentCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/CurrentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/DeleteCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/DeleteCest.php
index d5da459a612..00cb8af6df7 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/DeleteCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/FilterCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/FilterCest.php
index 4a2b276d8e4..7dcb16d68f9 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/FilterCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetCacheCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetCacheCest.php
index 1540cba7867..95e981dc262 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetCacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetFirstCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetFirstCest.php
index 3c15afbcbf6..ada6965a59f 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetFirstCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetFirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetHydrateModeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetHydrateModeCest.php
index 78070ebc08f..aee143f8c2a 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetHydrateModeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetHydrateModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetLastCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetLastCest.php
index 0a72ccff420..274b7f73367 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetLastCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetLastCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetMessagesCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetMessagesCest.php
index 13e9ecf0372..84de1d1aa7a 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetMessagesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetTypeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetTypeCest.php
index 6a9607dc4a3..ca8ceffb466 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetTypeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/IsFreshCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/IsFreshCest.php
index 6afa35e8adf..b3be820b0bd 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/IsFreshCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/IsFreshCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/JsonSerializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/JsonSerializeCest.php
index 8079b715cab..de64b297c37 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/JsonSerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/KeyCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/KeyCest.php
index 5fe470b6ee1..5f6125f4460 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/KeyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/KeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/NextCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/NextCest.php
index 4b8152f132d..74d9669a165 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/NextCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/NextCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetExistsCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetExistsCest.php
index a0a9128de6c..93b50a15f4c 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetExistsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetGetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetGetCest.php
index 68ed9b053ed..1df38b7da9a 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetGetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetSetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetSetCest.php
index 88545c9d2da..fb2ff7b40f0 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetSetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetUnsetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetUnsetCest.php
index 6bbf7ebf4b0..6f8ba9e4196 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetUnsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/RewindCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/RewindCest.php
index b377aa297e0..61b5d545f2b 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/RewindCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/RewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SeekCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SeekCest.php
index 3005765542f..5b305c1c46c 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SeekCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SeekCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SerializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SerializeCest.php
index fb4f8ae9825..ceb0652e539 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetHydrateModeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetHydrateModeCest.php
index 56aede59e0d..35a0683e2e1 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetHydrateModeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetHydrateModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetIsFreshCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetIsFreshCest.php
index a64bb47f7cd..3dfcc246ad8 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetIsFreshCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/SetIsFreshCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/ToArrayCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/ToArrayCest.php
index ef53a099e47..23c549c1746 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/ToArrayCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/UpdateCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/UpdateCest.php
index 86ba2ac9300..3d3255829c5 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/UpdateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/UpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Complex/ValidCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Complex/ValidCest.php
index c624c7612e0..36f0264b8c9 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Complex/ValidCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Complex/ValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Complex;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Complex;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Resultset/ConstructCest.php
index 4b521c531d8..e898813179d 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/CountCest.php b/tests/tocheck-database/Mvc/Model/Resultset/CountCest.php
index 2c8fa5f818e..9ec2d37767e 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/CountCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/CurrentCest.php b/tests/tocheck-database/Mvc/Model/Resultset/CurrentCest.php
index 3c64bf6e85b..bf86975db09 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/CurrentCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/CurrentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/DeleteCest.php b/tests/tocheck-database/Mvc/Model/Resultset/DeleteCest.php
index 2885e90499c..12a01ebe7be 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/DeleteCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/FilterCest.php b/tests/tocheck-database/Mvc/Model/Resultset/FilterCest.php
index 50d9ba01a91..24cb4b04277 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/FilterCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/GetCacheCest.php b/tests/tocheck-database/Mvc/Model/Resultset/GetCacheCest.php
index 7f680b54ff5..91ed5d6c2c9 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/GetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/GetCacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/GetFirstCest.php b/tests/tocheck-database/Mvc/Model/Resultset/GetFirstCest.php
index a73ee253c77..2eceb216ce6 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/GetFirstCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/GetFirstCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Migrations\ObjectsMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Migrations\ObjectsMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 /**
  * Class GetFirstCest
@@ -46,7 +46,7 @@ public function mvcModelResultsetGetFirst(IntegrationTester $I)
         $manager = $this->container->get('modelsManager');
         $results = $manager
             ->executeQuery(
-                'SELECT o.* FROM Phalcon\Test\Models\Objects AS o LIMIT 1'
+                'SELECT o.* FROM Phalcon\Tests\Models\Objects AS o LIMIT 1'
             );
         $record  = $results->getFirst();
         $id      = $record->obj_id;
@@ -54,7 +54,7 @@ public function mvcModelResultsetGetFirst(IntegrationTester $I)
 
         $results = $manager
             ->executeQuery(
-                'SELECT obj_id FROM Phalcon\Test\Models\Objects AS o LIMIT 1'
+                'SELECT obj_id FROM Phalcon\Tests\Models\Objects AS o LIMIT 1'
             );
         $record  = $results->getFirst();
         $id      = $record->obj_id;
@@ -62,7 +62,7 @@ public function mvcModelResultsetGetFirst(IntegrationTester $I)
 
         $results = $manager
             ->executeQuery(
-                'SELECT o.obj_id AS obj_id FROM Phalcon\Test\Models\Objects AS o LIMIT 1'
+                'SELECT o.obj_id AS obj_id FROM Phalcon\Tests\Models\Objects AS o LIMIT 1'
             );
         $record  = $results->getFirst();
         $id      = $record->obj_id;
@@ -74,8 +74,8 @@ public function mvcModelResultsetGetFirst(IntegrationTester $I)
                     o.obj_id,
                     s.stf_id
                 FROM
-                    Phalcon\Test\Models\Objects AS o,
-                    Phalcon\Test\Models\Stuff AS s
+                    Phalcon\Tests\Models\Objects AS o,
+                    Phalcon\Tests\Models\Stuff AS s
                 WHERE
                     o.obj_type = s.stf_type
                 LIMIT 1'
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/GetHydrateModeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/GetHydrateModeCest.php
index 9b8cb4f4c36..0734c132d40 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/GetHydrateModeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/GetHydrateModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/GetLastCest.php b/tests/tocheck-database/Mvc/Model/Resultset/GetLastCest.php
index 98d2bb0c23f..27562fa75ec 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/GetLastCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/GetLastCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/GetMessagesCest.php b/tests/tocheck-database/Mvc/Model/Resultset/GetMessagesCest.php
index 32c863a467d..40aa58334bf 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/GetMessagesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/GetTypeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/GetTypeCest.php
index 3cf9c3caa3b..e3aac5e3149 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/GetTypeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/IsFreshCest.php b/tests/tocheck-database/Mvc/Model/Resultset/IsFreshCest.php
index 66861f507f5..9f28a5cd592 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/IsFreshCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/IsFreshCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/JsonSerializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/JsonSerializeCest.php
index c751f3b3221..2e18ded21b5 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/JsonSerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/KeyCest.php b/tests/tocheck-database/Mvc/Model/Resultset/KeyCest.php
index 3e9835222b5..41c26a9ae45 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/KeyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/KeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/NextCest.php b/tests/tocheck-database/Mvc/Model/Resultset/NextCest.php
index db3b18e1283..cbc90a2f2bd 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/NextCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/NextCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/OffsetExistsCest.php b/tests/tocheck-database/Mvc/Model/Resultset/OffsetExistsCest.php
index 4381eac9144..5b0f12e6b73 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/OffsetExistsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/OffsetGetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/OffsetGetCest.php
index b05a154443b..5e91b16abda 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/OffsetGetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/OffsetSetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/OffsetSetCest.php
index 1b0e51f6f76..4e41f4090cb 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/OffsetSetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/OffsetUnsetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/OffsetUnsetCest.php
index fff3ae4e9a5..a65c19b5400 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/OffsetUnsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Refactor-ComplexCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Refactor-ComplexCest.php
index 2028755f017..39a8d2d4fea 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Refactor-ComplexCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Refactor-ComplexCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Resultset\Complex;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\RobotsParts;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\RobotsParts;
 
 class ComplexCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Refactor-SimpleCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Refactor-SimpleCest.php
index 5f14e37814d..0db17390ee3 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Refactor-SimpleCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Refactor-SimpleCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\People;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\People;
+use Phalcon\Tests\Models\Robots;
 
 class SimpleCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/RewindCest.php b/tests/tocheck-database/Mvc/Model/Resultset/RewindCest.php
index 209a182deb0..75a440b8639 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/RewindCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/RewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/SeekCest.php b/tests/tocheck-database/Mvc/Model/Resultset/SeekCest.php
index 43bfe59fbaf..4383ca7ec92 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/SeekCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/SeekCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/SerializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/SerializeCest.php
index 85586dd6964..5ec97d6bb8d 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/SerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/SetHydrateModeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/SetHydrateModeCest.php
index 18d47293547..41ccf593e44 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/SetHydrateModeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/SetHydrateModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/SetIsFreshCest.php b/tests/tocheck-database/Mvc/Model/Resultset/SetIsFreshCest.php
index 8afb61d07d0..ba0498df463 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/SetIsFreshCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/SetIsFreshCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/ConstructCest.php
index b1297098359..d553d748787 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/ConstructCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 use Phalcon\Helper\Str;
 use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 use function cacheModelsDir;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/CountCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/CountCest.php
index b38651d4319..68d2569e21b 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/CountCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/CurrentCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/CurrentCest.php
index f2ce7af5546..8ba8ad7185a 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/CurrentCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/CurrentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/DeleteCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/DeleteCest.php
index d8fd27e4122..e0d07af49d3 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/DeleteCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/FilterCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/FilterCest.php
index 4c3b6335036..e82a7f32a4c 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/FilterCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetCacheCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetCacheCest.php
index 988057a0d3b..881a7e82a54 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetCacheCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetCacheCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetFirstCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetFirstCest.php
index f824d7fd343..14cfae95aaf 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetFirstCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetFirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetHydrateModeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetHydrateModeCest.php
index be6309dc094..fba56a57a30 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetHydrateModeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetHydrateModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetLastCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetLastCest.php
index 86faeb403fb..9213610fc32 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetLastCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetLastCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetMessagesCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetMessagesCest.php
index 3d43d135ebc..a81184456bb 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetMessagesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetTypeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetTypeCest.php
index dd6b0d3f8b5..4812a23005a 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetTypeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/IsFreshCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/IsFreshCest.php
index f857db46814..870badd55cd 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/IsFreshCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/IsFreshCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/JsonSerializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/JsonSerializeCest.php
index 2ca0e08412a..8fb04c27dc7 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/JsonSerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/KeyCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/KeyCest.php
index eecad39766d..90d9a535f1d 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/KeyCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/KeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/NextCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/NextCest.php
index ad1d9931a81..d48bfcea8a5 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/NextCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/NextCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetExistsCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetExistsCest.php
index 90cbdffe725..51c06efb490 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetExistsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetGetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetGetCest.php
index 0db5211687f..61cb24d3a2f 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetGetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetSetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetSetCest.php
index 8f1f650d033..621d47dea45 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetSetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetUnsetCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetUnsetCest.php
index cc06562a8ae..75696b39886 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetUnsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/RewindCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/RewindCest.php
index ac69b42a815..ba492d7d6ed 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/RewindCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/RewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SeekCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SeekCest.php
index 890d11bd67a..c8ddf2fe9a3 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SeekCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SeekCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SerializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SerializeCest.php
index bb01d5a4d9e..5a9b4aab70f 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SerializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetHydrateModeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetHydrateModeCest.php
index 3ff8550023f..c0f0d671394 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetHydrateModeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetHydrateModeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetIsFreshCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetIsFreshCest.php
index 81b750ecc95..806bed39212 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetIsFreshCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/SetIsFreshCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/ToArrayCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/ToArrayCest.php
index bd3052a463a..ed8e168e765 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/ToArrayCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/ToArrayCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Test\Fixtures\Migrations\InvoicesMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Invoices;
-use Phalcon\Test\Models\InvoicesWithColumnMap;
+use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Invoices;
+use Phalcon\Tests\Models\InvoicesWithColumnMap;
 
 /**
  * Class ToArrayCest
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/UpdateCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/UpdateCest.php
index 4d7542e768b..d854d676394 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/UpdateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/UpdateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/Simple/ValidCest.php b/tests/tocheck-database/Mvc/Model/Resultset/Simple/ValidCest.php
index d88f64997a7..30d7f921b93 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/Simple/ValidCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/Simple/ValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset\Simple;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset\Simple;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/ToArrayCest.php b/tests/tocheck-database/Mvc/Model/Resultset/ToArrayCest.php
index 5291ba3aaec..af0fd2ee470 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/ToArrayCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/UnserializeCest.php b/tests/tocheck-database/Mvc/Model/Resultset/UnserializeCest.php
index 2fa4e3a691f..41d9e3768af 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/UnserializeCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/UpdateCest.php b/tests/tocheck-database/Mvc/Model/Resultset/UpdateCest.php
index 5943512f1d2..bac3630ef45 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/UpdateCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/UpdateCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Robots;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Robots;
 
 /**
  * Class UpdateCest
diff --git a/tests/tocheck-database/Mvc/Model/Resultset/ValidCest.php b/tests/tocheck-database/Mvc/Model/Resultset/ValidCest.php
index bd7b00a4e70..0583e5b316a 100644
--- a/tests/tocheck-database/Mvc/Model/Resultset/ValidCest.php
+++ b/tests/tocheck-database/Mvc/Model/Resultset/ValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Resultset;
+namespace Phalcon\Tests\Integration\Mvc\Model\Resultset;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SetConnectionServiceCest.php b/tests/tocheck-database/Mvc/Model/SetConnectionServiceCest.php
index 28e50ec6c28..cab3a8a0f19 100644
--- a/tests/tocheck-database/Mvc/Model/SetConnectionServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/SetConnectionServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SetDirtyStateCest.php b/tests/tocheck-database/Mvc/Model/SetDirtyStateCest.php
index 51538c44350..6052518fdd4 100644
--- a/tests/tocheck-database/Mvc/Model/SetDirtyStateCest.php
+++ b/tests/tocheck-database/Mvc/Model/SetDirtyStateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SetOldSnapshotDataCest.php b/tests/tocheck-database/Mvc/Model/SetOldSnapshotDataCest.php
index ae01a083b3c..163c61738a6 100644
--- a/tests/tocheck-database/Mvc/Model/SetOldSnapshotDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/SetOldSnapshotDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SetSnapshotDataCest.php b/tests/tocheck-database/Mvc/Model/SetSnapshotDataCest.php
index 072063c9853..110ae27f11b 100644
--- a/tests/tocheck-database/Mvc/Model/SetSnapshotDataCest.php
+++ b/tests/tocheck-database/Mvc/Model/SetSnapshotDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SetTransactionCest.php b/tests/tocheck-database/Mvc/Model/SetTransactionCest.php
index 515536a0374..082c35011ab 100644
--- a/tests/tocheck-database/Mvc/Model/SetTransactionCest.php
+++ b/tests/tocheck-database/Mvc/Model/SetTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SetupCest.php b/tests/tocheck-database/Mvc/Model/SetupCest.php
index 1f18ed56de2..af6f9bd4af9 100644
--- a/tests/tocheck-database/Mvc/Model/SetupCest.php
+++ b/tests/tocheck-database/Mvc/Model/SetupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/SkipOperationCest.php b/tests/tocheck-database/Mvc/Model/SkipOperationCest.php
index 5901ea14396..0567afa5718 100644
--- a/tests/tocheck-database/Mvc/Model/SkipOperationCest.php
+++ b/tests/tocheck-database/Mvc/Model/SkipOperationCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/BeginCest.php b/tests/tocheck-database/Mvc/Model/Transaction/BeginCest.php
index b962ffbe0e5..34687f60c7a 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/BeginCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/CommitCest.php b/tests/tocheck-database/Mvc/Model/Transaction/CommitCest.php
index 0def4c8cd9d..798183f5440 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/CommitCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Transaction/ConstructCest.php
index bfbb32c8475..24fc4b92f80 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/GetConnectionCest.php b/tests/tocheck-database/Mvc/Model/Transaction/GetConnectionCest.php
index 187b2ea4f4f..9d516c9b6c8 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/GetConnectionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/GetConnectionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 use Phalcon\Db\Adapter\AdapterInterface;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetConnectionCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/GetMessagesCest.php b/tests/tocheck-database/Mvc/Model/Transaction/GetMessagesCest.php
index 6d5b3f2a5c7..e023f3fde77 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/GetMessagesCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/IsManagedCest.php b/tests/tocheck-database/Mvc/Model/Transaction/IsManagedCest.php
index 6648f1d21da..912c2c6361d 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/IsManagedCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/IsManagedCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Transaction;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class IsManagedCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/IsValidCest.php b/tests/tocheck-database/Mvc/Model/Transaction/IsValidCest.php
index 3770e1323f6..30b9b260220 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/IsValidCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/IsValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/CollectTransactionsCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/CollectTransactionsCest.php
index a3a890edbc8..34af6bc785f 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/CollectTransactionsCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/CollectTransactionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/CommitCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/CommitCest.php
index a7e0959c977..23879098db1 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/CommitCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/ConstructCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/ConstructCest.php
index 0262b722f44..7b87860338f 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/ConstructCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetCest.php
index 248d91b6172..1d94cb26673 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model\Transaction;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 class GetCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDICest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDICest.php
index b6e75fdf52b..b6309c8a7bf 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDbServiceCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDbServiceCest.php
index e78ef7f7692..da45ab17c3f 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDbServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetDbServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetOrCreateTransactionCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetOrCreateTransactionCest.php
index ebe2cda017b..9d64408a1f6 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetOrCreateTransactionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetOrCreateTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetRollbackPendentCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetRollbackPendentCest.php
index c54ca656959..ba9cc164290 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetRollbackPendentCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/GetRollbackPendentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/HasCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/HasCest.php
index a6d0b0932a5..bdaf88629a0 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/HasCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyCommitCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyCommitCest.php
index 3d669f96056..519d1fad0b0 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyCommitCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyCommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyRollbackCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyRollbackCest.php
index 573b84f2b61..174d393f796 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyRollbackCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/NotifyRollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackCest.php
index 0ffa22ea9dc..f48f59aa077 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackPendentCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackPendentCest.php
index 7892c242a84..ab7c6f45a6c 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackPendentCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/RollbackPendentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDICest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDICest.php
index 5265eb84dc6..33b140ad430 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDICest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDbServiceCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDbServiceCest.php
index 8ba83ee1259..be6bf373006 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDbServiceCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetDbServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetRollbackPendentCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetRollbackPendentCest.php
index cd0442bd2a3..6b66fbe4beb 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetRollbackPendentCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Manager/SetRollbackPendentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction\Manager;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction\Manager;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/Refactor-ManagerCest.php b/tests/tocheck-database/Mvc/Model/Transaction/Refactor-ManagerCest.php
index c7dd1bea9f5..09dd89d0f50 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/Refactor-ManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/Refactor-ManagerCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\Transaction\Failed;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Personas;
-use Phalcon\Test\Models\Select;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Personas;
+use Phalcon\Tests\Models\Select;
 
 class ManagerCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/RollbackCest.php b/tests/tocheck-database/Mvc/Model/Transaction/RollbackCest.php
index 9c2f05a76eb..1500a0ca822 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/RollbackCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/RollbackCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model\Transaction\Failed;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Personas;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Personas;
 
 class RollbackCest
 {
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/SetIsNewTransactionCest.php b/tests/tocheck-database/Mvc/Model/Transaction/SetIsNewTransactionCest.php
index a7f5164fc61..6744594905c 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/SetIsNewTransactionCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/SetIsNewTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackOnAbortCest.php b/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackOnAbortCest.php
index da318c7c388..86bc745a782 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackOnAbortCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackOnAbortCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackedRecordCest.php b/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackedRecordCest.php
index 207fa5624c1..bcac48320e8 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackedRecordCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/SetRollbackedRecordCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/Transaction/SetTransactionManagerCest.php b/tests/tocheck-database/Mvc/Model/Transaction/SetTransactionManagerCest.php
index ceb7f5272ee..be1c9aa71d6 100644
--- a/tests/tocheck-database/Mvc/Model/Transaction/SetTransactionManagerCest.php
+++ b/tests/tocheck-database/Mvc/Model/Transaction/SetTransactionManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model\Transaction;
+namespace Phalcon\Tests\Integration\Mvc\Model\Transaction;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/Model/ValidationHasFailedCest.php b/tests/tocheck-database/Mvc/Model/ValidationHasFailedCest.php
index 53bc9993fcb..300bbcb4b67 100644
--- a/tests/tocheck-database/Mvc/Model/ValidationHasFailedCest.php
+++ b/tests/tocheck-database/Mvc/Model/ValidationHasFailedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 
diff --git a/tests/tocheck-database/Mvc/ModelCest.php b/tests/tocheck-database/Mvc/ModelCest.php
index 05570d11df3..96e097983c1 100644
--- a/tests/tocheck-database/Mvc/ModelCest.php
+++ b/tests/tocheck-database/Mvc/ModelCest.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Model;
-use Phalcon\Test\Fixtures\Migrations\StringPrimaryMigration;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\AlbumORama\Albums;
-use Phalcon\Test\Models\ModelWithStringPrimary;
+use Phalcon\Tests\Fixtures\Migrations\StringPrimaryMigration;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\AlbumORama\Albums;
+use Phalcon\Tests\Models\ModelWithStringPrimary;
 
 class ModelCest
 {
@@ -904,7 +904,7 @@ public function executeCamelCaseRelation(IntegrationTester $I)
 //            function () {
 //                $robots = new Robots();
 //                $robots->name = '';
-//                $robots->datetime = new \Phalcon\Test\Db\DateTime();
+//                $robots->datetime = new \Phalcon\Tests\Db\DateTime();
 //                $robots->text = 'text';
 //                $result = $robots->save();
 //                expect($result)->true();
diff --git a/tests/tocheck-database/Mvc/ModelCest.php_check b/tests/tocheck-database/Mvc/ModelCest.php_check
index 74c75ed663a..595c23a204c 100644
--- a/tests/tocheck-database/Mvc/ModelCest.php_check
+++ b/tests/tocheck-database/Mvc/ModelCest.php_check
@@ -1,14 +1,14 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use Phalcon\Cache\Backend\File;
 use Phalcon\Cache\Frontend\Data;
-use Phalcon\Test\Models\Snapshot\Robots;
+use Phalcon\Tests\Models\Snapshot\Robots;
 use IntegrationTester;
 
 /**
- * \Phalcon\Test\Integration\Mvc\ModelCest
+ * \Phalcon\Tests\Integration\Mvc\ModelCest
  * Tests the Phalcon\Mvc\Model component
  *
  * @copyright (c) 2011-2017 Phalcon Team
@@ -16,7 +16,7 @@ use IntegrationTester;
  * @author    Andres Gutierrez <andres@phalcon.io>
  * @author    Phalcon Team <team@phalcon.io>
  * @author    Wojciech Ślawski <jurigag@gmail.com>
- * @package   Phalcon\Test\Integration\Mvc
+ * @package   Phalcon\Tests\Integration\Mvc
  *
  * The contents of this file are subject to the New BSD License that is
  * bundled with this package in the file LICENSE.txt
diff --git a/tests/tocheck-database/Mvc/Refactor-ControllersCest.php b/tests/tocheck-database/Mvc/Refactor-ControllersCest.php
index e476328dd15..457ca257780 100644
--- a/tests/tocheck-database/Mvc/Refactor-ControllersCest.php
+++ b/tests/tocheck-database/Mvc/Refactor-ControllersCest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use IntegrationTester;
 use Phalcon\Di;
 use Phalcon\Mvc\Model\Manager;
 use Phalcon\Mvc\Model\MetaData\Memory;
-use Phalcon\Test\Controllers\ViewRequestController;
+use Phalcon\Tests\Controllers\ViewRequestController;
 
 /**
- * \Phalcon\Test\Integration\Mvc\ControllerCest
+ * \Phalcon\Tests\Integration\Mvc\ControllerCest
  * Tests the Phalcon\Mvc\Controller component
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/tocheck-database/Mvc/Refactor-MicroCest.php b/tests/tocheck-database/Mvc/Refactor-MicroCest.php
index c26c6d2f761..36f00011cd9 100644
--- a/tests/tocheck-database/Mvc/Refactor-MicroCest.php
+++ b/tests/tocheck-database/Mvc/Refactor-MicroCest.php
@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use IntegrationTester;
 use Phalcon\Events\Manager;
 use Phalcon\Mvc\Micro;
-use Phalcon\Test\Fixtures\Micro\MyMiddleware;
-use Phalcon\Test\Fixtures\Micro\MyMiddlewareStop;
-use Phalcon\Test\Fixtures\Micro\RestHandler;
+use Phalcon\Tests\Fixtures\Micro\MyMiddleware;
+use Phalcon\Tests\Fixtures\Micro\MyMiddlewareStop;
+use Phalcon\Tests\Fixtures\Micro\RestHandler;
 
 /**
- * Phalcon\Test\Integration\Mvc\MicroTest
+ * Phalcon\Tests\Integration\Mvc\MicroTest
  *
  * Tests the Phalcon\Mvc\Micro component
  */
diff --git a/tests/tocheck-database/Mvc/Refactor-ModelsCest.php b/tests/tocheck-database/Mvc/Refactor-ModelsCest.php
index 6efee9e7fca..a6117e5cf86 100644
--- a/tests/tocheck-database/Mvc/Refactor-ModelsCest.php
+++ b/tests/tocheck-database/Mvc/Refactor-ModelsCest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc\Model;
+namespace Phalcon\Tests\Integration\Mvc\Model;
 
 use IntegrationTester;
 use Phalcon\Db\RawValue;
 use Phalcon\Messages\Message as ModelMessage;
 use Phalcon\Mvc\Model;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Childs;
-use Phalcon\Test\Models\I1534;
-use Phalcon\Test\Models\Parts2;
-use Phalcon\Test\Models\People;
-use Phalcon\Test\Models\Personas;
-use Phalcon\Test\Models\Personers;
-use Phalcon\Test\Models\Robots;
-use Phalcon\Test\Models\Robotters;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Childs;
+use Phalcon\Tests\Models\I1534;
+use Phalcon\Tests\Models\Parts2;
+use Phalcon\Tests\Models\People;
+use Phalcon\Tests\Models\Personas;
+use Phalcon\Tests\Models\Personers;
+use Phalcon\Tests\Models\Robots;
+use Phalcon\Tests\Models\Robotters;
 use function is_object;
 
 class ModelsCest
@@ -235,7 +235,7 @@ private function issue886(IntegrationTester $I)
         $I->assertTrue(is_object($people));
 
         $I->assertInstanceOf(
-            \Phalcon\Test\Models\People::class,
+            \Phalcon\Tests\Models\People::class,
             $people
         );
 
diff --git a/tests/tocheck-database/Mvc/Refactor-RouterCest.php b/tests/tocheck-database/Mvc/Refactor-RouterCest.php
index d874d0cdbda..7be7956e91f 100644
--- a/tests/tocheck-database/Mvc/Refactor-RouterCest.php
+++ b/tests/tocheck-database/Mvc/Refactor-RouterCest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\Router\Route;
-use Phalcon\Test\Fixtures\Traits\RouterTrait;
+use Phalcon\Tests\Fixtures\Traits\RouterTrait;
 
 class RouterCest
 {
diff --git a/tests/tocheck-database/Mvc/Refactor-ViewEnginesCest.php b/tests/tocheck-database/Mvc/Refactor-ViewEnginesCest.php
index 9f97fffa0b3..af70eb8a388 100644
--- a/tests/tocheck-database/Mvc/Refactor-ViewEnginesCest.php
+++ b/tests/tocheck-database/Mvc/Refactor-ViewEnginesCest.php
@@ -17,16 +17,16 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use Codeception\Example;
 use IntegrationTester;
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\View\Engine\Php;
-use Phalcon\Test\Fixtures\Mvc\View\Engine\Mustache;
-use Phalcon\Test\Fixtures\Mvc\View\Engine\Twig;
-use Phalcon\Test\Fixtures\Mvc\View\IteratorObject;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Mvc\View\Engine\Mustache;
+use Phalcon\Tests\Fixtures\Mvc\View\Engine\Twig;
+use Phalcon\Tests\Fixtures\Mvc\View\IteratorObject;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 
 use function dataDir;
 
diff --git a/tests/tocheck-database/Mvc/Refactor-ViewTest.php_check b/tests/tocheck-database/Mvc/Refactor-ViewTest.php_check
index e88e7db2d61..d9b890ff59e 100644
--- a/tests/tocheck-database/Mvc/Refactor-ViewTest.php_check
+++ b/tests/tocheck-database/Mvc/Refactor-ViewTest.php_check
@@ -1,13 +1,13 @@
 <?php
 
-namespace Phalcon\Test\Integration\Mvc;
+namespace Phalcon\Tests\Integration\Mvc;
 
 use Helper\ViewTrait;
 use Phalcon\Cache\Backend\File as BackendCache;
 use Phalcon\Cache\Frontend\Output as FrontendCache;
 use Phalcon\Di;
 use Phalcon\Mvc\View;
-use Phalcon\Test\Module\IntegrationTest;
+use Phalcon\Tests\Module\IntegrationTest;
 use PHPIntegration\Framework\Exception as PhpIntegrationException;
 
 class ViewTest extends IntegrationTest
diff --git a/tests/tocheck-database/Validation/ValidationCest.php b/tests/tocheck-database/Validation/ValidationCest.php
index 8580b2f4400..1da031bb2f4 100644
--- a/tests/tocheck-database/Validation/ValidationCest.php
+++ b/tests/tocheck-database/Validation/ValidationCest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Phalcon\Test\Integration\Validation;
+namespace Phalcon\Tests\Integration\Validation;
 
 use IntegrationTester;
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Users;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Users;
 use Phalcon\Validation;
 use Phalcon\Validation\Validator\Alpha;
 use Phalcon\Validation\Validator\Email;
@@ -17,7 +17,7 @@
 use stdClass;
 
 /**
- * Phalcon\Test\Integration\ValidationCest
+ * Phalcon\Tests\Integration\ValidationCest
  * Tests the \Phalcon\Validation component
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php b/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php
index 6fef9c89598..8f5c3c3a5e0 100644
--- a/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/AddComponentCest.php b/tests/unit/Acl/Adapter/Memory/AddComponentCest.php
index eed533758a8..ad66f823a54 100644
--- a/tests/unit/Acl/Adapter/Memory/AddComponentCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AddComponentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/AddInheritCest.php b/tests/unit/Acl/Adapter/Memory/AddInheritCest.php
index 33facce0c12..f1572a54f1b 100644
--- a/tests/unit/Acl/Adapter/Memory/AddInheritCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AddInheritCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/AddRoleCest.php b/tests/unit/Acl/Adapter/Memory/AddRoleCest.php
index 962f10fcfc7..1dc2e8e99a0 100644
--- a/tests/unit/Acl/Adapter/Memory/AddRoleCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AddRoleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Exception;
diff --git a/tests/unit/Acl/Adapter/Memory/AllowCest.php b/tests/unit/Acl/Adapter/Memory/AllowCest.php
index dd463d962a9..091b6f55150 100644
--- a/tests/unit/Acl/Adapter/Memory/AllowCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AllowCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Exception;
 use Phalcon\Acl\Adapter\Memory;
@@ -19,8 +19,8 @@
 use Phalcon\Acl\Enum;
 use Phalcon\Acl\Exception as AclException;
 use Phalcon\Acl\Role;
-use Phalcon\Test\Fixtures\Acl\TestComponentAware;
-use Phalcon\Test\Fixtures\Acl\TestRoleAware;
+use Phalcon\Tests\Fixtures\Acl\TestComponentAware;
+use Phalcon\Tests\Fixtures\Acl\TestRoleAware;
 use UnitTester;
 
 class AllowCest
diff --git a/tests/unit/Acl/Adapter/Memory/ConstructCest.php b/tests/unit/Acl/Adapter/Memory/ConstructCest.php
index 4154e823156..d3c22b887ed 100644
--- a/tests/unit/Acl/Adapter/Memory/ConstructCest.php
+++ b/tests/unit/Acl/Adapter/Memory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/DenyCest.php b/tests/unit/Acl/Adapter/Memory/DenyCest.php
index d5d50fd2425..41ec14b83f2 100644
--- a/tests/unit/Acl/Adapter/Memory/DenyCest.php
+++ b/tests/unit/Acl/Adapter/Memory/DenyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php b/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php
index 806fdcd71db..5e5343e103f 100644
--- a/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php
+++ b/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php
index e78ed46ab8f..4b0cac2dd79 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php
index 9246b4085b2..9734a1c43d5 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php
index 53643f66bc4..5a20d75b16c 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Closure;
 use Phalcon\Acl\Adapter\Memory;
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCustomArgumentsCountCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCustomArgumentsCountCest.php
index fcaaea2458d..a61571759b7 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCustomArgumentsCountCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCustomArgumentsCountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveKeyCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveKeyCest.php
index 364ecfd6b66..21d83efab8d 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveKeyCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php
index 68778849236..26b9cdad34e 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/GetComponentsCest.php b/tests/unit/Acl/Adapter/Memory/GetComponentsCest.php
index 9671b9b1f11..a94912db408 100644
--- a/tests/unit/Acl/Adapter/Memory/GetComponentsCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetComponentsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/GetRolesCest.php b/tests/unit/Acl/Adapter/Memory/GetRolesCest.php
index a6d2135cf2a..500fffb34c6 100644
--- a/tests/unit/Acl/Adapter/Memory/GetRolesCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetRolesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Role;
diff --git a/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php b/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php
index 9680dc7d2a7..ccc0914fa5c 100644
--- a/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/GetSetEventsManagerCest.php b/tests/unit/Acl/Adapter/Memory/GetSetEventsManagerCest.php
index 213e2e894af..d414f354c8e 100644
--- a/tests/unit/Acl/Adapter/Memory/GetSetEventsManagerCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetSetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Events\Manager;
diff --git a/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php b/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php
index 9ce1ab22004..7fac2c6713c 100644
--- a/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Enum;
diff --git a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
index 89bdfb9fee9..8de7daeb392 100644
--- a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
+++ b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Exception;
 use Phalcon\Acl\Adapter\Memory;
@@ -19,9 +19,9 @@
 use Phalcon\Acl\Enum;
 use Phalcon\Acl\Exception as AclException;
 use Phalcon\Acl\Role;
-use Phalcon\Test\Fixtures\Acl\TestComponentAware;
-use Phalcon\Test\Fixtures\Acl\TestRoleAware;
-use Phalcon\Test\Fixtures\Acl\TestRoleComponentAware;
+use Phalcon\Tests\Fixtures\Acl\TestComponentAware;
+use Phalcon\Tests\Fixtures\Acl\TestRoleAware;
+use Phalcon\Tests\Fixtures\Acl\TestRoleComponentAware;
 use stdClass;
 use UnitTester;
 
diff --git a/tests/unit/Acl/Adapter/Memory/IsComponentCest.php b/tests/unit/Acl/Adapter/Memory/IsComponentCest.php
index 3510c6d740c..11399fbb572 100644
--- a/tests/unit/Acl/Adapter/Memory/IsComponentCest.php
+++ b/tests/unit/Acl/Adapter/Memory/IsComponentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Component;
diff --git a/tests/unit/Acl/Adapter/Memory/IsRoleCest.php b/tests/unit/Acl/Adapter/Memory/IsRoleCest.php
index 2231c0933e3..d6d985bd43e 100644
--- a/tests/unit/Acl/Adapter/Memory/IsRoleCest.php
+++ b/tests/unit/Acl/Adapter/Memory/IsRoleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Acl\Adapter\Memory;
 
 use Phalcon\Acl\Adapter\Memory;
 use Phalcon\Acl\Role;
diff --git a/tests/unit/Acl/Component/ConstructCest.php b/tests/unit/Acl/Component/ConstructCest.php
index 450196a09a4..8abdd0d9b49 100644
--- a/tests/unit/Acl/Component/ConstructCest.php
+++ b/tests/unit/Acl/Component/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Component;
+namespace Phalcon\Tests\Unit\Acl\Component;
 
 use ArgumentCountError;
 use BadMethodCallException;
diff --git a/tests/unit/Acl/Component/GetDescriptionCest.php b/tests/unit/Acl/Component/GetDescriptionCest.php
index 01461eded4f..411d057970b 100644
--- a/tests/unit/Acl/Component/GetDescriptionCest.php
+++ b/tests/unit/Acl/Component/GetDescriptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Component;
+namespace Phalcon\Tests\Unit\Acl\Component;
 
 use Phalcon\Acl\Component;
 use UnitTester;
diff --git a/tests/unit/Acl/Component/GetNameCest.php b/tests/unit/Acl/Component/GetNameCest.php
index 5896042dd44..f92e759ce1e 100644
--- a/tests/unit/Acl/Component/GetNameCest.php
+++ b/tests/unit/Acl/Component/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Component;
+namespace Phalcon\Tests\Unit\Acl\Component;
 
 use Phalcon\Acl\Component;
 use UnitTester;
diff --git a/tests/unit/Acl/Component/ToStringCest.php b/tests/unit/Acl/Component/ToStringCest.php
index fbc79f3ead3..bbaf51d3808 100644
--- a/tests/unit/Acl/Component/ToStringCest.php
+++ b/tests/unit/Acl/Component/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Component;
+namespace Phalcon\Tests\Unit\Acl\Component;
 
 use Phalcon\Acl\Component;
 use UnitTester;
diff --git a/tests/unit/Acl/Role/ConstructCest.php b/tests/unit/Acl/Role/ConstructCest.php
index a680d6c1132..f95eecd117b 100644
--- a/tests/unit/Acl/Role/ConstructCest.php
+++ b/tests/unit/Acl/Role/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Role;
+namespace Phalcon\Tests\Unit\Acl\Role;
 
 use ArgumentCountError;
 use BadMethodCallException;
diff --git a/tests/unit/Acl/Role/GetDescriptionCest.php b/tests/unit/Acl/Role/GetDescriptionCest.php
index e91fadc032f..28834d5d2ee 100644
--- a/tests/unit/Acl/Role/GetDescriptionCest.php
+++ b/tests/unit/Acl/Role/GetDescriptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Role;
+namespace Phalcon\Tests\Unit\Acl\Role;
 
 use Phalcon\Acl\Role;
 use UnitTester;
diff --git a/tests/unit/Acl/Role/GetNameCest.php b/tests/unit/Acl/Role/GetNameCest.php
index 6d59b5ea99e..4a15a75e56c 100644
--- a/tests/unit/Acl/Role/GetNameCest.php
+++ b/tests/unit/Acl/Role/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Role;
+namespace Phalcon\Tests\Unit\Acl\Role;
 
 use Phalcon\Acl\Role;
 use UnitTester;
diff --git a/tests/unit/Acl/Role/ToStringCest.php b/tests/unit/Acl/Role/ToStringCest.php
index 4f501aa377d..d6d68111a0d 100644
--- a/tests/unit/Acl/Role/ToStringCest.php
+++ b/tests/unit/Acl/Role/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Acl\Role;
+namespace Phalcon\Tests\Unit\Acl\Role;
 
 use Phalcon\Acl\Role;
 use UnitTester;
diff --git a/tests/unit/Annotations/Adapter/Apcu/ConstructCest.php b/tests/unit/Annotations/Adapter/Apcu/ConstructCest.php
index c7568f5eb35..82faa132d60 100644
--- a/tests/unit/Annotations/Adapter/Apcu/ConstructCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\AdapterInterface;
 use Phalcon\Annotations\Adapter\Apcu;
diff --git a/tests/unit/Annotations/Adapter/Apcu/GetCest.php b/tests/unit/Annotations/Adapter/Apcu/GetCest.php
index a3365f314a5..16aff5f0aaa 100644
--- a/tests/unit/Annotations/Adapter/Apcu/GetCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Apcu/GetMethodCest.php b/tests/unit/Annotations/Adapter/Apcu/GetMethodCest.php
index ea12df7d655..425d0e92fa8 100644
--- a/tests/unit/Annotations/Adapter/Apcu/GetMethodCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/GetMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Apcu/GetMethodsCest.php b/tests/unit/Annotations/Adapter/Apcu/GetMethodsCest.php
index ffa16c5b791..c9cea54720c 100644
--- a/tests/unit/Annotations/Adapter/Apcu/GetMethodsCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/GetMethodsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Apcu/GetPropertiesCest.php b/tests/unit/Annotations/Adapter/Apcu/GetPropertiesCest.php
index c331914c825..801d0464251 100644
--- a/tests/unit/Annotations/Adapter/Apcu/GetPropertiesCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/GetPropertiesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Apcu/GetPropertyCest.php b/tests/unit/Annotations/Adapter/Apcu/GetPropertyCest.php
index 7a63ff03efa..59df0ee3463 100644
--- a/tests/unit/Annotations/Adapter/Apcu/GetPropertyCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/GetPropertyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Apcu/GetSetReaderCest.php b/tests/unit/Annotations/Adapter/Apcu/GetSetReaderCest.php
index 7b603afd1c9..19fa3664e09 100644
--- a/tests/unit/Annotations/Adapter/Apcu/GetSetReaderCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/GetSetReaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Reader;
diff --git a/tests/unit/Annotations/Adapter/Apcu/ReadWriteCest.php b/tests/unit/Annotations/Adapter/Apcu/ReadWriteCest.php
index b67a976619c..d0990617e92 100644
--- a/tests/unit/Annotations/Adapter/Apcu/ReadWriteCest.php
+++ b/tests/unit/Annotations/Adapter/Apcu/ReadWriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Apcu;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Apcu;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Reflection;
diff --git a/tests/unit/Annotations/Adapter/ApcuCest.php b/tests/unit/Annotations/Adapter/ApcuCest.php
index 0c4358f8289..f9a99017293 100644
--- a/tests/unit/Annotations/Adapter/ApcuCest.php
+++ b/tests/unit/Annotations/Adapter/ApcuCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Annotations\Adapter;
+namespace Phalcon\Tests\Unit\Annotations\Adapter;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Memory/ConstructCest.php b/tests/unit/Annotations/Adapter/Memory/ConstructCest.php
index 04274381c24..eaa23fde5f3 100644
--- a/tests/unit/Annotations/Adapter/Memory/ConstructCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\AdapterInterface;
 use Phalcon\Annotations\Adapter\Memory;
diff --git a/tests/unit/Annotations/Adapter/Memory/GetCest.php b/tests/unit/Annotations/Adapter/Memory/GetCest.php
index 2e71789709f..7b53409fe2a 100644
--- a/tests/unit/Annotations/Adapter/Memory/GetCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Memory/GetMethodCest.php b/tests/unit/Annotations/Adapter/Memory/GetMethodCest.php
index 8dea5e12dc6..0b56516682b 100644
--- a/tests/unit/Annotations/Adapter/Memory/GetMethodCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/GetMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Memory/GetMethodsCest.php b/tests/unit/Annotations/Adapter/Memory/GetMethodsCest.php
index a312be48e2e..5a0592f98f0 100644
--- a/tests/unit/Annotations/Adapter/Memory/GetMethodsCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/GetMethodsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Memory/GetPropertiesCest.php b/tests/unit/Annotations/Adapter/Memory/GetPropertiesCest.php
index 5bbf54aa89d..88939c14b9e 100644
--- a/tests/unit/Annotations/Adapter/Memory/GetPropertiesCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/GetPropertiesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Memory/GetPropertyCest.php b/tests/unit/Annotations/Adapter/Memory/GetPropertyCest.php
index bcdbc3e5264..0944cc1bce2 100644
--- a/tests/unit/Annotations/Adapter/Memory/GetPropertyCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/GetPropertyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Memory/GetSetReaderCest.php b/tests/unit/Annotations/Adapter/Memory/GetSetReaderCest.php
index 51c7957fbf9..cb536e817c0 100644
--- a/tests/unit/Annotations/Adapter/Memory/GetSetReaderCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/GetSetReaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Reader;
diff --git a/tests/unit/Annotations/Adapter/Memory/ReadWriteCest.php b/tests/unit/Annotations/Adapter/Memory/ReadWriteCest.php
index 54eca3dda8b..62b1235dcfe 100644
--- a/tests/unit/Annotations/Adapter/Memory/ReadWriteCest.php
+++ b/tests/unit/Annotations/Adapter/Memory/ReadWriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Memory;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Memory;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Reflection;
diff --git a/tests/unit/Annotations/Adapter/MemoryCest.php b/tests/unit/Annotations/Adapter/MemoryCest.php
index ffc398a6f06..9c51c359a9c 100644
--- a/tests/unit/Annotations/Adapter/MemoryCest.php
+++ b/tests/unit/Annotations/Adapter/MemoryCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Annotations\Adapter;
+namespace Phalcon\Tests\Unit\Annotations\Adapter;
 
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Stream/ConstructCest.php b/tests/unit/Annotations/Adapter/Stream/ConstructCest.php
index ac3f46e8db1..b7ba7fffb07 100644
--- a/tests/unit/Annotations/Adapter/Stream/ConstructCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\AdapterInterface;
 use Phalcon\Annotations\Adapter\Stream;
diff --git a/tests/unit/Annotations/Adapter/Stream/GetCest.php b/tests/unit/Annotations/Adapter/Stream/GetCest.php
index 7ea874bb36b..c2018924673 100644
--- a/tests/unit/Annotations/Adapter/Stream/GetCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Stream/GetMethodCest.php b/tests/unit/Annotations/Adapter/Stream/GetMethodCest.php
index 29f9dc392c1..348870ddcbe 100644
--- a/tests/unit/Annotations/Adapter/Stream/GetMethodCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/GetMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Stream/GetMethodsCest.php b/tests/unit/Annotations/Adapter/Stream/GetMethodsCest.php
index 36661421d27..01c9b3aa77a 100644
--- a/tests/unit/Annotations/Adapter/Stream/GetMethodsCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/GetMethodsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Stream/GetPropertiesCest.php b/tests/unit/Annotations/Adapter/Stream/GetPropertiesCest.php
index 45a28b7c7f6..c0562a475f9 100644
--- a/tests/unit/Annotations/Adapter/Stream/GetPropertiesCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/GetPropertiesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Stream/GetPropertyCest.php b/tests/unit/Annotations/Adapter/Stream/GetPropertyCest.php
index a0aa83d6ad7..a1e62011dbf 100644
--- a/tests/unit/Annotations/Adapter/Stream/GetPropertyCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/GetPropertyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Adapter/Stream/GetSetReaderCest.php b/tests/unit/Annotations/Adapter/Stream/GetSetReaderCest.php
index ccad5549d7b..e1b92f649f7 100644
--- a/tests/unit/Annotations/Adapter/Stream/GetSetReaderCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/GetSetReaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Reader;
diff --git a/tests/unit/Annotations/Adapter/Stream/ReadCest.php b/tests/unit/Annotations/Adapter/Stream/ReadCest.php
index 34eecafcaf0..a485c8f2e62 100644
--- a/tests/unit/Annotations/Adapter/Stream/ReadCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use Phalcon\Annotations\Reflection;
diff --git a/tests/unit/Annotations/Adapter/Stream/WriteCest.php b/tests/unit/Annotations/Adapter/Stream/WriteCest.php
index d19290f4259..16353471c77 100644
--- a/tests/unit/Annotations/Adapter/Stream/WriteCest.php
+++ b/tests/unit/Annotations/Adapter/Stream/WriteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Annotations\Adapter\Stream;
 
 use Phalcon\Annotations\Adapter\Stream;
 use TestClass;
diff --git a/tests/unit/Annotations/Annotation/ConstructCest.php b/tests/unit/Annotations/Annotation/ConstructCest.php
index ac6adf4dad6..1567441d9ee 100644
--- a/tests/unit/Annotations/Annotation/ConstructCest.php
+++ b/tests/unit/Annotations/Annotation/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetArgumentCest.php b/tests/unit/Annotations/Annotation/GetArgumentCest.php
index bf923471c50..a5be21379d5 100644
--- a/tests/unit/Annotations/Annotation/GetArgumentCest.php
+++ b/tests/unit/Annotations/Annotation/GetArgumentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetArgumentsCest.php b/tests/unit/Annotations/Annotation/GetArgumentsCest.php
index f3c97bc2961..0a920cd190d 100644
--- a/tests/unit/Annotations/Annotation/GetArgumentsCest.php
+++ b/tests/unit/Annotations/Annotation/GetArgumentsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetExprArgumentsCest.php b/tests/unit/Annotations/Annotation/GetExprArgumentsCest.php
index 3269cadf358..ec780e600b3 100644
--- a/tests/unit/Annotations/Annotation/GetExprArgumentsCest.php
+++ b/tests/unit/Annotations/Annotation/GetExprArgumentsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetExpressionCest.php b/tests/unit/Annotations/Annotation/GetExpressionCest.php
index f4d2bab333b..d8333e12e97 100644
--- a/tests/unit/Annotations/Annotation/GetExpressionCest.php
+++ b/tests/unit/Annotations/Annotation/GetExpressionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetNameCest.php b/tests/unit/Annotations/Annotation/GetNameCest.php
index 434d99c4d82..0b90e649561 100644
--- a/tests/unit/Annotations/Annotation/GetNameCest.php
+++ b/tests/unit/Annotations/Annotation/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetNamedArgumentCest.php b/tests/unit/Annotations/Annotation/GetNamedArgumentCest.php
index 35995e079e7..9facbb51309 100644
--- a/tests/unit/Annotations/Annotation/GetNamedArgumentCest.php
+++ b/tests/unit/Annotations/Annotation/GetNamedArgumentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/GetNamedParameterCest.php b/tests/unit/Annotations/Annotation/GetNamedParameterCest.php
index 955c4635213..b207574c029 100644
--- a/tests/unit/Annotations/Annotation/GetNamedParameterCest.php
+++ b/tests/unit/Annotations/Annotation/GetNamedParameterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/HasArgumentCest.php b/tests/unit/Annotations/Annotation/HasArgumentCest.php
index 6d5950eb58f..987a2ef6a57 100644
--- a/tests/unit/Annotations/Annotation/HasArgumentCest.php
+++ b/tests/unit/Annotations/Annotation/HasArgumentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/Annotation/NumberArgumentsCest.php b/tests/unit/Annotations/Annotation/NumberArgumentsCest.php
index 797cc7450a4..b4421549a6f 100644
--- a/tests/unit/Annotations/Annotation/NumberArgumentsCest.php
+++ b/tests/unit/Annotations/Annotation/NumberArgumentsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Annotation;
+namespace Phalcon\Tests\Unit\Annotations\Annotation;
 
 use Phalcon\Annotations\Annotation;
 use UnitTester;
diff --git a/tests/unit/Annotations/AnnotationsFactory/LoadCest.php b/tests/unit/Annotations/AnnotationsFactory/LoadCest.php
index 095c09b05b7..01dfa8a09cf 100644
--- a/tests/unit/Annotations/AnnotationsFactory/LoadCest.php
+++ b/tests/unit/Annotations/AnnotationsFactory/LoadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\AnnotationsFactory;
+namespace Phalcon\Tests\Unit\Annotations\AnnotationsFactory;
 
 use Phalcon\Annotations\Adapter\Apcu;
 use Phalcon\Annotations\AnnotationsFactory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 use UnitTester;
 
 class LoadCest
diff --git a/tests/unit/Annotations/AnnotationsFactory/NewInstanceCest.php b/tests/unit/Annotations/AnnotationsFactory/NewInstanceCest.php
index c4fd9072e5b..2846d1bce35 100644
--- a/tests/unit/Annotations/AnnotationsFactory/NewInstanceCest.php
+++ b/tests/unit/Annotations/AnnotationsFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\AnnotationsFactory;
+namespace Phalcon\Tests\Unit\Annotations\AnnotationsFactory;
 
 use Codeception\Example;
 use Phalcon\Annotations\Adapter\Apcu;
diff --git a/tests/unit/Annotations/Collection/ConstructCest.php b/tests/unit/Annotations/Collection/ConstructCest.php
index b84ae239cc9..17ade806b72 100644
--- a/tests/unit/Annotations/Collection/ConstructCest.php
+++ b/tests/unit/Annotations/Collection/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Collection;
 use UnitTester;
diff --git a/tests/unit/Annotations/Collection/CountCest.php b/tests/unit/Annotations/Collection/CountCest.php
index 4cf3c2017a3..860483699a4 100644
--- a/tests/unit/Annotations/Collection/CountCest.php
+++ b/tests/unit/Annotations/Collection/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Collection;
 use UnitTester;
diff --git a/tests/unit/Annotations/Collection/CurrentCest.php b/tests/unit/Annotations/Collection/CurrentCest.php
index 17fa55d2d90..93ba5da3e59 100644
--- a/tests/unit/Annotations/Collection/CurrentCest.php
+++ b/tests/unit/Annotations/Collection/CurrentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Collection/GetAllCest.php b/tests/unit/Annotations/Collection/GetAllCest.php
index e4caedc7449..cacf505c455 100644
--- a/tests/unit/Annotations/Collection/GetAllCest.php
+++ b/tests/unit/Annotations/Collection/GetAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Collection/GetAnnotationsCest.php b/tests/unit/Annotations/Collection/GetAnnotationsCest.php
index 9126b92d440..409de595e22 100644
--- a/tests/unit/Annotations/Collection/GetAnnotationsCest.php
+++ b/tests/unit/Annotations/Collection/GetAnnotationsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Collection/GetCest.php b/tests/unit/Annotations/Collection/GetCest.php
index b99e77623c7..32fd07b4429 100644
--- a/tests/unit/Annotations/Collection/GetCest.php
+++ b/tests/unit/Annotations/Collection/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Collection/HasCest.php b/tests/unit/Annotations/Collection/HasCest.php
index d3ed7712854..4b0906ea839 100644
--- a/tests/unit/Annotations/Collection/HasCest.php
+++ b/tests/unit/Annotations/Collection/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Collection;
 use UnitTester;
diff --git a/tests/unit/Annotations/Collection/KeyNextRewindCest.php b/tests/unit/Annotations/Collection/KeyNextRewindCest.php
index b7cd415c0e6..df5396d4c9a 100644
--- a/tests/unit/Annotations/Collection/KeyNextRewindCest.php
+++ b/tests/unit/Annotations/Collection/KeyNextRewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Collection/ValidCest.php b/tests/unit/Annotations/Collection/ValidCest.php
index db0bfd0f189..e776dabae33 100644
--- a/tests/unit/Annotations/Collection/ValidCest.php
+++ b/tests/unit/Annotations/Collection/ValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Collection;
+namespace Phalcon\Tests\Unit\Annotations\Collection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Reader/ParseCest.php b/tests/unit/Annotations/Reader/ParseCest.php
index 1a8a6a7bd2a..1bde7500749 100644
--- a/tests/unit/Annotations/Reader/ParseCest.php
+++ b/tests/unit/Annotations/Reader/ParseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reader;
+namespace Phalcon\Tests\Unit\Annotations\Reader;
 
 use Phalcon\Annotations\Exception;
 use Phalcon\Annotations\Reader;
diff --git a/tests/unit/Annotations/Reader/ParseDocBlockCest.php b/tests/unit/Annotations/Reader/ParseDocBlockCest.php
index 1877f61276f..6492557a153 100644
--- a/tests/unit/Annotations/Reader/ParseDocBlockCest.php
+++ b/tests/unit/Annotations/Reader/ParseDocBlockCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reader;
+namespace Phalcon\Tests\Unit\Annotations\Reader;
 
 use Phalcon\Annotations\Reader;
 use UnitTester;
diff --git a/tests/unit/Annotations/Reflection/ConstructCest.php b/tests/unit/Annotations/Reflection/ConstructCest.php
index 5c6e374a3e4..8563ea60f13 100644
--- a/tests/unit/Annotations/Reflection/ConstructCest.php
+++ b/tests/unit/Annotations/Reflection/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reflection;
+namespace Phalcon\Tests\Unit\Annotations\Reflection;
 
 use Phalcon\Annotations\Reflection;
 use UnitTester;
diff --git a/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php b/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php
index e611f85a8ec..5cefb1deef4 100644
--- a/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php
+++ b/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reflection;
+namespace Phalcon\Tests\Unit\Annotations\Reflection;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php b/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php
index c4854d39883..c48b86f9e0a 100644
--- a/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php
+++ b/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reflection;
+namespace Phalcon\Tests\Unit\Annotations\Reflection;
 
 use Phalcon\Annotations\Collection;
 use Phalcon\Annotations\Reader;
diff --git a/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php b/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php
index 13db6857725..622a110416a 100644
--- a/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php
+++ b/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reflection;
+namespace Phalcon\Tests\Unit\Annotations\Reflection;
 
 use Phalcon\Annotations\Collection;
 use Phalcon\Annotations\Reader;
diff --git a/tests/unit/Annotations/Reflection/GetReflectionDataCest.php b/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
index e2d6af24101..4ccac5a982b 100644
--- a/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
+++ b/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Annotations\Reflection;
+namespace Phalcon\Tests\Unit\Annotations\Reflection;
 
 use UnitTester;
 
diff --git a/tests/unit/Annotations/ReflectionCest.php b/tests/unit/Annotations/ReflectionCest.php
index 457fd0cbef7..af523f54ac3 100644
--- a/tests/unit/Annotations/ReflectionCest.php
+++ b/tests/unit/Annotations/ReflectionCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Annotations;
+namespace Phalcon\Tests\Unit\Annotations;
 
 use Phalcon\Annotations\Annotation;
 use Phalcon\Annotations\Collection;
diff --git a/tests/unit/Assets/Asset/ConstructCest.php b/tests/unit/Assets/Asset/ConstructCest.php
index 82484787e72..5dc67ad2284 100644
--- a/tests/unit/Assets/Asset/ConstructCest.php
+++ b/tests/unit/Assets/Asset/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/Css/ConstructCest.php b/tests/unit/Assets/Asset/Css/ConstructCest.php
index 2cab21c8bfc..5914b30256a 100644
--- a/tests/unit/Assets/Asset/Css/ConstructCest.php
+++ b/tests/unit/Assets/Asset/Css/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetAssetKeyCest.php b/tests/unit/Assets/Asset/Css/GetAssetKeyCest.php
index 013ad500a3d..ab92071ed5c 100644
--- a/tests/unit/Assets/Asset/Css/GetAssetKeyCest.php
+++ b/tests/unit/Assets/Asset/Css/GetAssetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/GetAttributesCest.php b/tests/unit/Assets/Asset/Css/GetAttributesCest.php
index eccdec744fc..679fb4b13b2 100644
--- a/tests/unit/Assets/Asset/Css/GetAttributesCest.php
+++ b/tests/unit/Assets/Asset/Css/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/GetContentCest.php b/tests/unit/Assets/Asset/Css/GetContentCest.php
index 491109650e9..692829fd030 100644
--- a/tests/unit/Assets/Asset/Css/GetContentCest.php
+++ b/tests/unit/Assets/Asset/Css/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/GetFilterCest.php b/tests/unit/Assets/Asset/Css/GetFilterCest.php
index 70f492a5b8c..0f2c658b11b 100644
--- a/tests/unit/Assets/Asset/Css/GetFilterCest.php
+++ b/tests/unit/Assets/Asset/Css/GetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/GetLocalCest.php b/tests/unit/Assets/Asset/Css/GetLocalCest.php
index 854199952d7..a4d887216e2 100644
--- a/tests/unit/Assets/Asset/Css/GetLocalCest.php
+++ b/tests/unit/Assets/Asset/Css/GetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetPathCest.php b/tests/unit/Assets/Asset/Css/GetPathCest.php
index 973a8096377..4952ca987d8 100644
--- a/tests/unit/Assets/Asset/Css/GetPathCest.php
+++ b/tests/unit/Assets/Asset/Css/GetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetRealSourcePathCest.php b/tests/unit/Assets/Asset/Css/GetRealSourcePathCest.php
index 47dc18ea62a..b8f543e6d21 100644
--- a/tests/unit/Assets/Asset/Css/GetRealSourcePathCest.php
+++ b/tests/unit/Assets/Asset/Css/GetRealSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/GetRealTargetPathCest.php b/tests/unit/Assets/Asset/Css/GetRealTargetPathCest.php
index fa4d3a3a411..d3ab92d56f5 100644
--- a/tests/unit/Assets/Asset/Css/GetRealTargetPathCest.php
+++ b/tests/unit/Assets/Asset/Css/GetRealTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetRealTargetUriCest.php b/tests/unit/Assets/Asset/Css/GetRealTargetUriCest.php
index 793000a765b..a1cb4d58626 100644
--- a/tests/unit/Assets/Asset/Css/GetRealTargetUriCest.php
+++ b/tests/unit/Assets/Asset/Css/GetRealTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetSetVersionCest.php b/tests/unit/Assets/Asset/Css/GetSetVersionCest.php
index 1c13248f8f6..a47f29836e6 100644
--- a/tests/unit/Assets/Asset/Css/GetSetVersionCest.php
+++ b/tests/unit/Assets/Asset/Css/GetSetVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/GetSourcePathCest.php b/tests/unit/Assets/Asset/Css/GetSourcePathCest.php
index e72a8d9d55e..b0bb100dc53 100644
--- a/tests/unit/Assets/Asset/Css/GetSourcePathCest.php
+++ b/tests/unit/Assets/Asset/Css/GetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetTargetPathCest.php b/tests/unit/Assets/Asset/Css/GetTargetPathCest.php
index 175d2b4446d..392c59f1cbf 100644
--- a/tests/unit/Assets/Asset/Css/GetTargetPathCest.php
+++ b/tests/unit/Assets/Asset/Css/GetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetTargetUriCest.php b/tests/unit/Assets/Asset/Css/GetTargetUriCest.php
index bdaf7177686..9f9f7995155 100644
--- a/tests/unit/Assets/Asset/Css/GetTargetUriCest.php
+++ b/tests/unit/Assets/Asset/Css/GetTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/GetTypeCest.php b/tests/unit/Assets/Asset/Css/GetTypeCest.php
index 1b047849f35..ce022c1998c 100644
--- a/tests/unit/Assets/Asset/Css/GetTypeCest.php
+++ b/tests/unit/Assets/Asset/Css/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/IsSetAutoVersionCest.php b/tests/unit/Assets/Asset/Css/IsSetAutoVersionCest.php
index 8ea15f7ce84..8c3ac775d00 100644
--- a/tests/unit/Assets/Asset/Css/IsSetAutoVersionCest.php
+++ b/tests/unit/Assets/Asset/Css/IsSetAutoVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Phalcon\Assets\Asset\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Css/SetAttributesCest.php b/tests/unit/Assets/Asset/Css/SetAttributesCest.php
index e2be89cadc8..533703bcf58 100644
--- a/tests/unit/Assets/Asset/Css/SetAttributesCest.php
+++ b/tests/unit/Assets/Asset/Css/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetFilterCest.php b/tests/unit/Assets/Asset/Css/SetFilterCest.php
index ba0026f055d..d58e25c76de 100644
--- a/tests/unit/Assets/Asset/Css/SetFilterCest.php
+++ b/tests/unit/Assets/Asset/Css/SetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetLocalCest.php b/tests/unit/Assets/Asset/Css/SetLocalCest.php
index 896ed70dda3..a3c5f090084 100644
--- a/tests/unit/Assets/Asset/Css/SetLocalCest.php
+++ b/tests/unit/Assets/Asset/Css/SetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetPathCest.php b/tests/unit/Assets/Asset/Css/SetPathCest.php
index 07f12cc51bf..3b9d8347fb8 100644
--- a/tests/unit/Assets/Asset/Css/SetPathCest.php
+++ b/tests/unit/Assets/Asset/Css/SetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetSourcePathCest.php b/tests/unit/Assets/Asset/Css/SetSourcePathCest.php
index 9750984ba15..fe7334da61a 100644
--- a/tests/unit/Assets/Asset/Css/SetSourcePathCest.php
+++ b/tests/unit/Assets/Asset/Css/SetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetTargetPathCest.php b/tests/unit/Assets/Asset/Css/SetTargetPathCest.php
index 4443bd704d1..6919ee69376 100644
--- a/tests/unit/Assets/Asset/Css/SetTargetPathCest.php
+++ b/tests/unit/Assets/Asset/Css/SetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetTargetUriCest.php b/tests/unit/Assets/Asset/Css/SetTargetUriCest.php
index dc1550312c8..44ea1e17101 100644
--- a/tests/unit/Assets/Asset/Css/SetTargetUriCest.php
+++ b/tests/unit/Assets/Asset/Css/SetTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/Css/SetTypeCest.php b/tests/unit/Assets/Asset/Css/SetTypeCest.php
index 527cca93d51..1ef88ed6a30 100644
--- a/tests/unit/Assets/Asset/Css/SetTypeCest.php
+++ b/tests/unit/Assets/Asset/Css/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Css;
+namespace Phalcon\Tests\Unit\Assets\Asset\Css;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Asset/GetAssetKeyCest.php b/tests/unit/Assets/Asset/GetAssetKeyCest.php
index 0041daee9b4..d80a80ae86f 100644
--- a/tests/unit/Assets/Asset/GetAssetKeyCest.php
+++ b/tests/unit/Assets/Asset/GetAssetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetAttributesCest.php b/tests/unit/Assets/Asset/GetAttributesCest.php
index 39832ec930c..9a58292142f 100644
--- a/tests/unit/Assets/Asset/GetAttributesCest.php
+++ b/tests/unit/Assets/Asset/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetContentCest.php b/tests/unit/Assets/Asset/GetContentCest.php
index 122704e93a7..b3a4b4ed089 100644
--- a/tests/unit/Assets/Asset/GetContentCest.php
+++ b/tests/unit/Assets/Asset/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetFilterCest.php b/tests/unit/Assets/Asset/GetFilterCest.php
index dc1d79870b1..5c2113b4ce1 100644
--- a/tests/unit/Assets/Asset/GetFilterCest.php
+++ b/tests/unit/Assets/Asset/GetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetLocalCest.php b/tests/unit/Assets/Asset/GetLocalCest.php
index 980d2961bab..743008d1fd4 100644
--- a/tests/unit/Assets/Asset/GetLocalCest.php
+++ b/tests/unit/Assets/Asset/GetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetPathCest.php b/tests/unit/Assets/Asset/GetPathCest.php
index b95bad85d8f..c09a022421e 100644
--- a/tests/unit/Assets/Asset/GetPathCest.php
+++ b/tests/unit/Assets/Asset/GetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetRealSourcePathCest.php b/tests/unit/Assets/Asset/GetRealSourcePathCest.php
index 78a497b3280..4f70ac4050e 100644
--- a/tests/unit/Assets/Asset/GetRealSourcePathCest.php
+++ b/tests/unit/Assets/Asset/GetRealSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetRealTargetPathCest.php b/tests/unit/Assets/Asset/GetRealTargetPathCest.php
index 08724abf55f..aadd2d0737b 100644
--- a/tests/unit/Assets/Asset/GetRealTargetPathCest.php
+++ b/tests/unit/Assets/Asset/GetRealTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetRealTargetUriCest.php b/tests/unit/Assets/Asset/GetRealTargetUriCest.php
index 2e95b267c95..da900dbd489 100644
--- a/tests/unit/Assets/Asset/GetRealTargetUriCest.php
+++ b/tests/unit/Assets/Asset/GetRealTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetSetVersionCest.php b/tests/unit/Assets/Asset/GetSetVersionCest.php
index cd745579e36..e8c65ee2193 100644
--- a/tests/unit/Assets/Asset/GetSetVersionCest.php
+++ b/tests/unit/Assets/Asset/GetSetVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Phalcon\Assets\Asset;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/GetSourcePathCest.php b/tests/unit/Assets/Asset/GetSourcePathCest.php
index 5e59a6adda9..95ce2038cf2 100644
--- a/tests/unit/Assets/Asset/GetSourcePathCest.php
+++ b/tests/unit/Assets/Asset/GetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetTargetPathCest.php b/tests/unit/Assets/Asset/GetTargetPathCest.php
index 2b89c25222b..9b7844bc4b8 100644
--- a/tests/unit/Assets/Asset/GetTargetPathCest.php
+++ b/tests/unit/Assets/Asset/GetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/GetTargetUriCest.php b/tests/unit/Assets/Asset/GetTargetUriCest.php
index 226d20c8699..41032e36cfc 100644
--- a/tests/unit/Assets/Asset/GetTargetUriCest.php
+++ b/tests/unit/Assets/Asset/GetTargetUriCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Assets/Asset/GetTypeCest.php b/tests/unit/Assets/Asset/GetTypeCest.php
index 7ec14c638e5..e8d2e400299 100644
--- a/tests/unit/Assets/Asset/GetTypeCest.php
+++ b/tests/unit/Assets/Asset/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/IsSetAutoVersionCest.php b/tests/unit/Assets/Asset/IsSetAutoVersionCest.php
index 97ab3cd4c4f..758cf3645f1 100644
--- a/tests/unit/Assets/Asset/IsSetAutoVersionCest.php
+++ b/tests/unit/Assets/Asset/IsSetAutoVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Phalcon\Assets\Asset;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/ConstructCest.php b/tests/unit/Assets/Asset/Js/ConstructCest.php
index db4209ae78b..a954d07afc4 100644
--- a/tests/unit/Assets/Asset/Js/ConstructCest.php
+++ b/tests/unit/Assets/Asset/Js/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetAssetKeyCest.php b/tests/unit/Assets/Asset/Js/GetAssetKeyCest.php
index 568183e216b..7c3ea4024cb 100644
--- a/tests/unit/Assets/Asset/Js/GetAssetKeyCest.php
+++ b/tests/unit/Assets/Asset/Js/GetAssetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/GetAttributesCest.php b/tests/unit/Assets/Asset/Js/GetAttributesCest.php
index 88032b79d5e..46591083214 100644
--- a/tests/unit/Assets/Asset/Js/GetAttributesCest.php
+++ b/tests/unit/Assets/Asset/Js/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/GetContentCest.php b/tests/unit/Assets/Asset/Js/GetContentCest.php
index f99c11f9e50..bea365b8c19 100644
--- a/tests/unit/Assets/Asset/Js/GetContentCest.php
+++ b/tests/unit/Assets/Asset/Js/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/GetFilterCest.php b/tests/unit/Assets/Asset/Js/GetFilterCest.php
index bd357f62cd0..0e8b5c2a725 100644
--- a/tests/unit/Assets/Asset/Js/GetFilterCest.php
+++ b/tests/unit/Assets/Asset/Js/GetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/GetLocalCest.php b/tests/unit/Assets/Asset/Js/GetLocalCest.php
index 733f94f3c28..9219d5ee301 100644
--- a/tests/unit/Assets/Asset/Js/GetLocalCest.php
+++ b/tests/unit/Assets/Asset/Js/GetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetPathCest.php b/tests/unit/Assets/Asset/Js/GetPathCest.php
index cd877b2afa7..182aee47d54 100644
--- a/tests/unit/Assets/Asset/Js/GetPathCest.php
+++ b/tests/unit/Assets/Asset/Js/GetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetRealSourcePathCest.php b/tests/unit/Assets/Asset/Js/GetRealSourcePathCest.php
index c57442fda22..105eb7e0ec3 100644
--- a/tests/unit/Assets/Asset/Js/GetRealSourcePathCest.php
+++ b/tests/unit/Assets/Asset/Js/GetRealSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/GetRealTargetPathCest.php b/tests/unit/Assets/Asset/Js/GetRealTargetPathCest.php
index f22e7566d80..23b2397ff81 100644
--- a/tests/unit/Assets/Asset/Js/GetRealTargetPathCest.php
+++ b/tests/unit/Assets/Asset/Js/GetRealTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetRealTargetUriCest.php b/tests/unit/Assets/Asset/Js/GetRealTargetUriCest.php
index cca8fa24a0f..6ec641fb4a0 100644
--- a/tests/unit/Assets/Asset/Js/GetRealTargetUriCest.php
+++ b/tests/unit/Assets/Asset/Js/GetRealTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetSetVersionCest.php b/tests/unit/Assets/Asset/Js/GetSetVersionCest.php
index 420fb8f2b8a..a9e45ce5134 100644
--- a/tests/unit/Assets/Asset/Js/GetSetVersionCest.php
+++ b/tests/unit/Assets/Asset/Js/GetSetVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/GetSourcePathCest.php b/tests/unit/Assets/Asset/Js/GetSourcePathCest.php
index d6701061c34..73fac48f791 100644
--- a/tests/unit/Assets/Asset/Js/GetSourcePathCest.php
+++ b/tests/unit/Assets/Asset/Js/GetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetTargetPathCest.php b/tests/unit/Assets/Asset/Js/GetTargetPathCest.php
index 10d175db0e7..479405ca43d 100644
--- a/tests/unit/Assets/Asset/Js/GetTargetPathCest.php
+++ b/tests/unit/Assets/Asset/Js/GetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetTargetUriCest.php b/tests/unit/Assets/Asset/Js/GetTargetUriCest.php
index d71261427db..9d7c2906ca5 100644
--- a/tests/unit/Assets/Asset/Js/GetTargetUriCest.php
+++ b/tests/unit/Assets/Asset/Js/GetTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/GetTypeCest.php b/tests/unit/Assets/Asset/Js/GetTypeCest.php
index aa640689d38..bb43d990e52 100644
--- a/tests/unit/Assets/Asset/Js/GetTypeCest.php
+++ b/tests/unit/Assets/Asset/Js/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/IsSetAutoVersionCest.php b/tests/unit/Assets/Asset/Js/IsSetAutoVersionCest.php
index 46a46a2f0c2..655fe18ca1a 100644
--- a/tests/unit/Assets/Asset/Js/IsSetAutoVersionCest.php
+++ b/tests/unit/Assets/Asset/Js/IsSetAutoVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Phalcon\Assets\Asset\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Asset/Js/SetAttributesCest.php b/tests/unit/Assets/Asset/Js/SetAttributesCest.php
index 9ce58413655..97616285163 100644
--- a/tests/unit/Assets/Asset/Js/SetAttributesCest.php
+++ b/tests/unit/Assets/Asset/Js/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetFilterCest.php b/tests/unit/Assets/Asset/Js/SetFilterCest.php
index 7fbf5e5dd5f..84bde35454e 100644
--- a/tests/unit/Assets/Asset/Js/SetFilterCest.php
+++ b/tests/unit/Assets/Asset/Js/SetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetLocalCest.php b/tests/unit/Assets/Asset/Js/SetLocalCest.php
index e35ca445848..015ac7927db 100644
--- a/tests/unit/Assets/Asset/Js/SetLocalCest.php
+++ b/tests/unit/Assets/Asset/Js/SetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetPathCest.php b/tests/unit/Assets/Asset/Js/SetPathCest.php
index 55d5a1cdfb5..126201b91e9 100644
--- a/tests/unit/Assets/Asset/Js/SetPathCest.php
+++ b/tests/unit/Assets/Asset/Js/SetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetSourcePathCest.php b/tests/unit/Assets/Asset/Js/SetSourcePathCest.php
index e18ba58c460..a47b27f2313 100644
--- a/tests/unit/Assets/Asset/Js/SetSourcePathCest.php
+++ b/tests/unit/Assets/Asset/Js/SetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetTargetPathCest.php b/tests/unit/Assets/Asset/Js/SetTargetPathCest.php
index a356715be48..250da7340ba 100644
--- a/tests/unit/Assets/Asset/Js/SetTargetPathCest.php
+++ b/tests/unit/Assets/Asset/Js/SetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetTargetUriCest.php b/tests/unit/Assets/Asset/Js/SetTargetUriCest.php
index b9fc3c91b8e..3fedc311d72 100644
--- a/tests/unit/Assets/Asset/Js/SetTargetUriCest.php
+++ b/tests/unit/Assets/Asset/Js/SetTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/Js/SetTypeCest.php b/tests/unit/Assets/Asset/Js/SetTypeCest.php
index ca3d812e44e..73f9c3fed5e 100644
--- a/tests/unit/Assets/Asset/Js/SetTypeCest.php
+++ b/tests/unit/Assets/Asset/Js/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset\Js;
+namespace Phalcon\Tests\Unit\Assets\Asset\Js;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset\Js;
diff --git a/tests/unit/Assets/Asset/SetAttributesCest.php b/tests/unit/Assets/Asset/SetAttributesCest.php
index d820b90a2e0..08515d4d44a 100644
--- a/tests/unit/Assets/Asset/SetAttributesCest.php
+++ b/tests/unit/Assets/Asset/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetFilterCest.php b/tests/unit/Assets/Asset/SetFilterCest.php
index 4235379ba64..92423d73ad4 100644
--- a/tests/unit/Assets/Asset/SetFilterCest.php
+++ b/tests/unit/Assets/Asset/SetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetLocalCest.php b/tests/unit/Assets/Asset/SetLocalCest.php
index 1608fc3fca9..aaae401157c 100644
--- a/tests/unit/Assets/Asset/SetLocalCest.php
+++ b/tests/unit/Assets/Asset/SetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetPathCest.php b/tests/unit/Assets/Asset/SetPathCest.php
index c58b2856f89..1f401a0a4dd 100644
--- a/tests/unit/Assets/Asset/SetPathCest.php
+++ b/tests/unit/Assets/Asset/SetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetSourcePathCest.php b/tests/unit/Assets/Asset/SetSourcePathCest.php
index 3cbf8be1724..ec566eb98ee 100644
--- a/tests/unit/Assets/Asset/SetSourcePathCest.php
+++ b/tests/unit/Assets/Asset/SetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetTargetPathCest.php b/tests/unit/Assets/Asset/SetTargetPathCest.php
index 013af80096a..0556ebefb25 100644
--- a/tests/unit/Assets/Asset/SetTargetPathCest.php
+++ b/tests/unit/Assets/Asset/SetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetTargetUriCest.php b/tests/unit/Assets/Asset/SetTargetUriCest.php
index 28bad91a4da..c4873cdb568 100644
--- a/tests/unit/Assets/Asset/SetTargetUriCest.php
+++ b/tests/unit/Assets/Asset/SetTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Asset/SetTypeCest.php b/tests/unit/Assets/Asset/SetTypeCest.php
index 4d50d21572a..742c4c1daa7 100644
--- a/tests/unit/Assets/Asset/SetTypeCest.php
+++ b/tests/unit/Assets/Asset/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Asset;
+namespace Phalcon\Tests\Unit\Assets\Asset;
 
 use Codeception\Example;
 use Phalcon\Assets\Asset;
diff --git a/tests/unit/Assets/Collection/AddCest.php b/tests/unit/Assets/Collection/AddCest.php
index 934072bb7b2..952f5f38581 100644
--- a/tests/unit/Assets/Collection/AddCest.php
+++ b/tests/unit/Assets/Collection/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Asset;
 use Phalcon\Assets\Collection;
diff --git a/tests/unit/Assets/Collection/AddCssCest.php b/tests/unit/Assets/Collection/AddCssCest.php
index ec00f78ed92..c3acd569ead 100644
--- a/tests/unit/Assets/Collection/AddCssCest.php
+++ b/tests/unit/Assets/Collection/AddCssCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/AddFilterCest.php b/tests/unit/Assets/Collection/AddFilterCest.php
index d27f737d5a3..058ffd8a893 100644
--- a/tests/unit/Assets/Collection/AddFilterCest.php
+++ b/tests/unit/Assets/Collection/AddFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use Phalcon\Assets\Filters\None;
diff --git a/tests/unit/Assets/Collection/AddInlineCest.php b/tests/unit/Assets/Collection/AddInlineCest.php
index d959e63becb..b2a8ea19053 100644
--- a/tests/unit/Assets/Collection/AddInlineCest.php
+++ b/tests/unit/Assets/Collection/AddInlineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Collection/AddInlineCssCest.php b/tests/unit/Assets/Collection/AddInlineCssCest.php
index 0b539847b73..3f4c3800f19 100644
--- a/tests/unit/Assets/Collection/AddInlineCssCest.php
+++ b/tests/unit/Assets/Collection/AddInlineCssCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use Phalcon\Assets\Inline\Css;
diff --git a/tests/unit/Assets/Collection/AddInlineJsCest.php b/tests/unit/Assets/Collection/AddInlineJsCest.php
index 31d5a9d43cd..4cf0bfeff8d 100644
--- a/tests/unit/Assets/Collection/AddInlineJsCest.php
+++ b/tests/unit/Assets/Collection/AddInlineJsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use Phalcon\Assets\Inline\Js;
diff --git a/tests/unit/Assets/Collection/ConstructCest.php b/tests/unit/Assets/Collection/ConstructCest.php
index 6ba0eeddd02..a29b01c9afc 100644
--- a/tests/unit/Assets/Collection/ConstructCest.php
+++ b/tests/unit/Assets/Collection/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetAssetsCest.php b/tests/unit/Assets/Collection/GetAssetsCest.php
index 26bd3627c13..483e6cf6a60 100644
--- a/tests/unit/Assets/Collection/GetAssetsCest.php
+++ b/tests/unit/Assets/Collection/GetAssetsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Asset;
 use Phalcon\Assets\Collection;
diff --git a/tests/unit/Assets/Collection/GetCodesCest.php b/tests/unit/Assets/Collection/GetCodesCest.php
index f089b19bee5..b8a0f3465da 100644
--- a/tests/unit/Assets/Collection/GetCodesCest.php
+++ b/tests/unit/Assets/Collection/GetCodesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use Phalcon\Assets\Inline\Css;
diff --git a/tests/unit/Assets/Collection/GetPositionCest.php b/tests/unit/Assets/Collection/GetPositionCest.php
index 026de81b00c..078927d4319 100644
--- a/tests/unit/Assets/Collection/GetPositionCest.php
+++ b/tests/unit/Assets/Collection/GetPositionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetRealTargetPathCest.php b/tests/unit/Assets/Collection/GetRealTargetPathCest.php
index 2e2e2844b8b..11b6c36e7de 100644
--- a/tests/unit/Assets/Collection/GetRealTargetPathCest.php
+++ b/tests/unit/Assets/Collection/GetRealTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetAttributesCest.php b/tests/unit/Assets/Collection/GetSetAttributesCest.php
index 75f2dc36160..6716f819b6d 100644
--- a/tests/unit/Assets/Collection/GetSetAttributesCest.php
+++ b/tests/unit/Assets/Collection/GetSetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetFiltersCest.php b/tests/unit/Assets/Collection/GetSetFiltersCest.php
index 4f919ca488b..f941702c68f 100644
--- a/tests/unit/Assets/Collection/GetSetFiltersCest.php
+++ b/tests/unit/Assets/Collection/GetSetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use Phalcon\Assets\Filters\None;
diff --git a/tests/unit/Assets/Collection/GetSetJoinCest.php b/tests/unit/Assets/Collection/GetSetJoinCest.php
index 3b6511c8a7c..2bc03ee5894 100644
--- a/tests/unit/Assets/Collection/GetSetJoinCest.php
+++ b/tests/unit/Assets/Collection/GetSetJoinCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetLocalCest.php b/tests/unit/Assets/Collection/GetSetLocalCest.php
index d1b8f9a8b5f..f87042c76bf 100644
--- a/tests/unit/Assets/Collection/GetSetLocalCest.php
+++ b/tests/unit/Assets/Collection/GetSetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetPrefixCest.php b/tests/unit/Assets/Collection/GetSetPrefixCest.php
index 3a728c83537..c3c2e21df98 100644
--- a/tests/unit/Assets/Collection/GetSetPrefixCest.php
+++ b/tests/unit/Assets/Collection/GetSetPrefixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetSourcePathCest.php b/tests/unit/Assets/Collection/GetSetSourcePathCest.php
index 81fbdf4c7d7..7f0eddc4293 100644
--- a/tests/unit/Assets/Collection/GetSetSourcePathCest.php
+++ b/tests/unit/Assets/Collection/GetSetSourcePathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetTargetLocalCest.php b/tests/unit/Assets/Collection/GetSetTargetLocalCest.php
index 7ce9147de59..2608396be5c 100644
--- a/tests/unit/Assets/Collection/GetSetTargetLocalCest.php
+++ b/tests/unit/Assets/Collection/GetSetTargetLocalCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetTargetPathCest.php b/tests/unit/Assets/Collection/GetSetTargetPathCest.php
index 6e2acc19591..c099fd90192 100644
--- a/tests/unit/Assets/Collection/GetSetTargetPathCest.php
+++ b/tests/unit/Assets/Collection/GetSetTargetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetTargetUriCest.php b/tests/unit/Assets/Collection/GetSetTargetUriCest.php
index 77d29b1a5b8..876a3cdde39 100644
--- a/tests/unit/Assets/Collection/GetSetTargetUriCest.php
+++ b/tests/unit/Assets/Collection/GetSetTargetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/GetSetVersionCest.php b/tests/unit/Assets/Collection/GetSetVersionCest.php
index 0318108e6ad..f31de4572e8 100644
--- a/tests/unit/Assets/Collection/GetSetVersionCest.php
+++ b/tests/unit/Assets/Collection/GetSetVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/HasCest.php b/tests/unit/Assets/Collection/HasCest.php
index 18d81cbe20b..cb571b9d53e 100644
--- a/tests/unit/Assets/Collection/HasCest.php
+++ b/tests/unit/Assets/Collection/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Asset;
 use Phalcon\Assets\Collection;
diff --git a/tests/unit/Assets/Collection/IsSetAutoVersionCest.php b/tests/unit/Assets/Collection/IsSetAutoVersionCest.php
index 4e99b31bc62..5689ee854d1 100644
--- a/tests/unit/Assets/Collection/IsSetAutoVersionCest.php
+++ b/tests/unit/Assets/Collection/IsSetAutoVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/KeyNextRewindCest.php b/tests/unit/Assets/Collection/KeyNextRewindCest.php
index dedc162542d..59bd3c41d41 100644
--- a/tests/unit/Assets/Collection/KeyNextRewindCest.php
+++ b/tests/unit/Assets/Collection/KeyNextRewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Collection/ValidCest.php b/tests/unit/Assets/Collection/ValidCest.php
index 3a0dfc2746c..2af71602c32 100644
--- a/tests/unit/Assets/Collection/ValidCest.php
+++ b/tests/unit/Assets/Collection/ValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Collection;
+namespace Phalcon\Tests\Unit\Assets\Collection;
 
 use Phalcon\Assets\Collection;
 use UnitTester;
diff --git a/tests/unit/Assets/Filters/Cssmin/ConstructCest.php b/tests/unit/Assets/Filters/Cssmin/ConstructCest.php
index fae10209fb2..bcdfadd9c57 100644
--- a/tests/unit/Assets/Filters/Cssmin/ConstructCest.php
+++ b/tests/unit/Assets/Filters/Cssmin/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Filters\Cssmin;
+namespace Phalcon\Tests\Unit\Assets\Filters\Cssmin;
 
 use Phalcon\Assets\FilterInterface;
 use Phalcon\Assets\Filters\Cssmin;
diff --git a/tests/unit/Assets/Filters/Cssmin/FilterCest.php b/tests/unit/Assets/Filters/Cssmin/FilterCest.php
index 5747448c2b9..846186de0f0 100644
--- a/tests/unit/Assets/Filters/Cssmin/FilterCest.php
+++ b/tests/unit/Assets/Filters/Cssmin/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Filters\Cssmin;
+namespace Phalcon\Tests\Unit\Assets\Filters\Cssmin;
 
 use Phalcon\Assets\Filters\Cssmin;
 use UnitTester;
diff --git a/tests/unit/Assets/Filters/Jsmin/ConstructCest.php b/tests/unit/Assets/Filters/Jsmin/ConstructCest.php
index 148759a3d83..778b16a7b39 100644
--- a/tests/unit/Assets/Filters/Jsmin/ConstructCest.php
+++ b/tests/unit/Assets/Filters/Jsmin/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Filters\Jsmin;
+namespace Phalcon\Tests\Unit\Assets\Filters\Jsmin;
 
 use Phalcon\Assets\FilterInterface;
 use Phalcon\Assets\Filters\Jsmin;
diff --git a/tests/unit/Assets/Filters/Jsmin/FilterCest.php b/tests/unit/Assets/Filters/Jsmin/FilterCest.php
index 3f26ca70e52..6a2c12f070b 100644
--- a/tests/unit/Assets/Filters/Jsmin/FilterCest.php
+++ b/tests/unit/Assets/Filters/Jsmin/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Filters\Jsmin;
+namespace Phalcon\Tests\Unit\Assets\Filters\Jsmin;
 
 use Phalcon\Assets\Filters\Jsmin;
 use UnitTester;
diff --git a/tests/unit/Assets/Filters/None/FilterCest.php b/tests/unit/Assets/Filters/None/FilterCest.php
index 20ed755cbe6..5c19e11540c 100644
--- a/tests/unit/Assets/Filters/None/FilterCest.php
+++ b/tests/unit/Assets/Filters/None/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Filters\None;
+namespace Phalcon\Tests\Unit\Assets\Filters\None;
 
 use Phalcon\Assets\Filters\None;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/ConstructCest.php b/tests/unit/Assets/Inline/ConstructCest.php
index 04e34bb1979..5f4518507de 100644
--- a/tests/unit/Assets/Inline/ConstructCest.php
+++ b/tests/unit/Assets/Inline/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Phalcon\Assets\Inline;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/ConstructCest.php b/tests/unit/Assets/Inline/Css/ConstructCest.php
index d0229c3ee38..3fd0c0beb85 100644
--- a/tests/unit/Assets/Inline/Css/ConstructCest.php
+++ b/tests/unit/Assets/Inline/Css/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/GetAssetKeyCest.php b/tests/unit/Assets/Inline/Css/GetAssetKeyCest.php
index e4577ca562b..a0a42a37544 100644
--- a/tests/unit/Assets/Inline/Css/GetAssetKeyCest.php
+++ b/tests/unit/Assets/Inline/Css/GetAssetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/GetAttributesCest.php b/tests/unit/Assets/Inline/Css/GetAttributesCest.php
index 2de8a81a67e..dae2bb7aa85 100644
--- a/tests/unit/Assets/Inline/Css/GetAttributesCest.php
+++ b/tests/unit/Assets/Inline/Css/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/GetContentCest.php b/tests/unit/Assets/Inline/Css/GetContentCest.php
index e48db2811f2..5abf17242f9 100644
--- a/tests/unit/Assets/Inline/Css/GetContentCest.php
+++ b/tests/unit/Assets/Inline/Css/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/GetFilterCest.php b/tests/unit/Assets/Inline/Css/GetFilterCest.php
index e37cb6a57ab..c52dfbc9fed 100644
--- a/tests/unit/Assets/Inline/Css/GetFilterCest.php
+++ b/tests/unit/Assets/Inline/Css/GetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/GetTypeCest.php b/tests/unit/Assets/Inline/Css/GetTypeCest.php
index 37f5723f5c7..1f356999b88 100644
--- a/tests/unit/Assets/Inline/Css/GetTypeCest.php
+++ b/tests/unit/Assets/Inline/Css/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/SetAttributesCest.php b/tests/unit/Assets/Inline/Css/SetAttributesCest.php
index 85ede029552..225105f88cc 100644
--- a/tests/unit/Assets/Inline/Css/SetAttributesCest.php
+++ b/tests/unit/Assets/Inline/Css/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/SetFilterCest.php b/tests/unit/Assets/Inline/Css/SetFilterCest.php
index 5e425972a70..9f1d4084400 100644
--- a/tests/unit/Assets/Inline/Css/SetFilterCest.php
+++ b/tests/unit/Assets/Inline/Css/SetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Css/SetTypeCest.php b/tests/unit/Assets/Inline/Css/SetTypeCest.php
index bc12375a4d1..e086618def8 100644
--- a/tests/unit/Assets/Inline/Css/SetTypeCest.php
+++ b/tests/unit/Assets/Inline/Css/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Css;
+namespace Phalcon\Tests\Unit\Assets\Inline\Css;
 
 use Phalcon\Assets\Inline\Css;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/GetAssetKeyCest.php b/tests/unit/Assets/Inline/GetAssetKeyCest.php
index 16609007b36..2c351d4bfc6 100644
--- a/tests/unit/Assets/Inline/GetAssetKeyCest.php
+++ b/tests/unit/Assets/Inline/GetAssetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/GetAttributesCest.php b/tests/unit/Assets/Inline/GetAttributesCest.php
index ae473ca97fb..ad84cccb5d1 100644
--- a/tests/unit/Assets/Inline/GetAttributesCest.php
+++ b/tests/unit/Assets/Inline/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/GetContentCest.php b/tests/unit/Assets/Inline/GetContentCest.php
index 11163d527ea..b703aeec996 100644
--- a/tests/unit/Assets/Inline/GetContentCest.php
+++ b/tests/unit/Assets/Inline/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/GetFilterCest.php b/tests/unit/Assets/Inline/GetFilterCest.php
index 8a9ce3cb63d..cff1fda262b 100644
--- a/tests/unit/Assets/Inline/GetFilterCest.php
+++ b/tests/unit/Assets/Inline/GetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/GetTypeCest.php b/tests/unit/Assets/Inline/GetTypeCest.php
index 87d7c9437f3..08060f39633 100644
--- a/tests/unit/Assets/Inline/GetTypeCest.php
+++ b/tests/unit/Assets/Inline/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/Js/ConstructCest.php b/tests/unit/Assets/Inline/Js/ConstructCest.php
index ff1d9b33593..675ff5a8ddd 100644
--- a/tests/unit/Assets/Inline/Js/ConstructCest.php
+++ b/tests/unit/Assets/Inline/Js/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/GetAssetKeyCest.php b/tests/unit/Assets/Inline/Js/GetAssetKeyCest.php
index 52d9ccb7760..06055a8e561 100644
--- a/tests/unit/Assets/Inline/Js/GetAssetKeyCest.php
+++ b/tests/unit/Assets/Inline/Js/GetAssetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/GetAttributesCest.php b/tests/unit/Assets/Inline/Js/GetAttributesCest.php
index 45eac33acdd..f16de74ac59 100644
--- a/tests/unit/Assets/Inline/Js/GetAttributesCest.php
+++ b/tests/unit/Assets/Inline/Js/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/GetContentCest.php b/tests/unit/Assets/Inline/Js/GetContentCest.php
index 81062f447e0..0a4356754b2 100644
--- a/tests/unit/Assets/Inline/Js/GetContentCest.php
+++ b/tests/unit/Assets/Inline/Js/GetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/GetFilterCest.php b/tests/unit/Assets/Inline/Js/GetFilterCest.php
index e5205ccadac..9e4ef3807b2 100644
--- a/tests/unit/Assets/Inline/Js/GetFilterCest.php
+++ b/tests/unit/Assets/Inline/Js/GetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/GetTypeCest.php b/tests/unit/Assets/Inline/Js/GetTypeCest.php
index dea94b7a2d2..6d5b0a10506 100644
--- a/tests/unit/Assets/Inline/Js/GetTypeCest.php
+++ b/tests/unit/Assets/Inline/Js/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/SetAttributesCest.php b/tests/unit/Assets/Inline/Js/SetAttributesCest.php
index 160578ddf91..d65a056cef4 100644
--- a/tests/unit/Assets/Inline/Js/SetAttributesCest.php
+++ b/tests/unit/Assets/Inline/Js/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/SetFilterCest.php b/tests/unit/Assets/Inline/Js/SetFilterCest.php
index 2bbb3e3fa4d..9a4e93d1b4f 100644
--- a/tests/unit/Assets/Inline/Js/SetFilterCest.php
+++ b/tests/unit/Assets/Inline/Js/SetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/Js/SetTypeCest.php b/tests/unit/Assets/Inline/Js/SetTypeCest.php
index fbe25010020..e323003ad6e 100644
--- a/tests/unit/Assets/Inline/Js/SetTypeCest.php
+++ b/tests/unit/Assets/Inline/Js/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline\Js;
+namespace Phalcon\Tests\Unit\Assets\Inline\Js;
 
 use Phalcon\Assets\Inline\Js;
 use UnitTester;
diff --git a/tests/unit/Assets/Inline/SetAttributesCest.php b/tests/unit/Assets/Inline/SetAttributesCest.php
index adc1179e33e..3719ec988e9 100644
--- a/tests/unit/Assets/Inline/SetAttributesCest.php
+++ b/tests/unit/Assets/Inline/SetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/SetFilterCest.php b/tests/unit/Assets/Inline/SetFilterCest.php
index f0bec17a04f..144fb0b9c4e 100644
--- a/tests/unit/Assets/Inline/SetFilterCest.php
+++ b/tests/unit/Assets/Inline/SetFilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Inline/SetTypeCest.php b/tests/unit/Assets/Inline/SetTypeCest.php
index 33e3f0893c5..0e84a3b95e5 100644
--- a/tests/unit/Assets/Inline/SetTypeCest.php
+++ b/tests/unit/Assets/Inline/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Inline;
+namespace Phalcon\Tests\Unit\Assets\Inline;
 
 use Codeception\Example;
 use Phalcon\Assets\Inline;
diff --git a/tests/unit/Assets/Manager/AddAssetByTypeCest.php b/tests/unit/Assets/Manager/AddAssetByTypeCest.php
index a7c7eed8a48..61291049625 100644
--- a/tests/unit/Assets/Manager/AddAssetByTypeCest.php
+++ b/tests/unit/Assets/Manager/AddAssetByTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Asset\Css;
 use Phalcon\Assets\Manager;
diff --git a/tests/unit/Assets/Manager/AddAssetCest.php b/tests/unit/Assets/Manager/AddAssetCest.php
index 704872b26eb..32c4c030d01 100644
--- a/tests/unit/Assets/Manager/AddAssetCest.php
+++ b/tests/unit/Assets/Manager/AddAssetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Asset\Css;
 use Phalcon\Assets\Manager;
diff --git a/tests/unit/Assets/Manager/AddCssCest.php b/tests/unit/Assets/Manager/AddCssCest.php
index e7e94eb4cd3..fb251bc552b 100644
--- a/tests/unit/Assets/Manager/AddCssCest.php
+++ b/tests/unit/Assets/Manager/AddCssCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
 use UnitTester;
diff --git a/tests/unit/Assets/Manager/AddInlineCodeCest.php b/tests/unit/Assets/Manager/AddInlineCodeCest.php
index 57e3248e41e..69360b5cc0a 100644
--- a/tests/unit/Assets/Manager/AddInlineCodeCest.php
+++ b/tests/unit/Assets/Manager/AddInlineCodeCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Inline;
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function ob_end_clean;
diff --git a/tests/unit/Assets/Manager/AddInlineCssCest.php b/tests/unit/Assets/Manager/AddInlineCssCest.php
index ab1e6fcab25..8e72b5005d0 100644
--- a/tests/unit/Assets/Manager/AddInlineCssCest.php
+++ b/tests/unit/Assets/Manager/AddInlineCssCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function ob_end_clean;
diff --git a/tests/unit/Assets/Manager/AddInlineJsCest.php b/tests/unit/Assets/Manager/AddInlineJsCest.php
index b0f39c830ee..ef87066019d 100644
--- a/tests/unit/Assets/Manager/AddInlineJsCest.php
+++ b/tests/unit/Assets/Manager/AddInlineJsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Assets/Manager/AddJsCest.php b/tests/unit/Assets/Manager/AddJsCest.php
index 8d950c519c3..4d254375281 100644
--- a/tests/unit/Assets/Manager/AddJsCest.php
+++ b/tests/unit/Assets/Manager/AddJsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Assets/Manager/CollectionAssetsByTypeCest.php b/tests/unit/Assets/Manager/CollectionAssetsByTypeCest.php
index f25a97f64a1..0b2d3aba292 100644
--- a/tests/unit/Assets/Manager/CollectionAssetsByTypeCest.php
+++ b/tests/unit/Assets/Manager/CollectionAssetsByTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Asset;
 use Phalcon\Assets\Asset\Css;
diff --git a/tests/unit/Assets/Manager/CollectionCest.php b/tests/unit/Assets/Manager/CollectionCest.php
index acb8450d5bc..2c1cef93a9f 100644
--- a/tests/unit/Assets/Manager/CollectionCest.php
+++ b/tests/unit/Assets/Manager/CollectionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Countable;
 use Iterator;
diff --git a/tests/unit/Assets/Manager/ConstructCest.php b/tests/unit/Assets/Manager/ConstructCest.php
index 14831caa5fe..cdf99ae9a06 100644
--- a/tests/unit/Assets/Manager/ConstructCest.php
+++ b/tests/unit/Assets/Manager/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
 use Phalcon\Di\InjectionAwareInterface;
diff --git a/tests/unit/Assets/Manager/ExistsCest.php b/tests/unit/Assets/Manager/ExistsCest.php
index e8642b2a4fb..f67e65881f5 100644
--- a/tests/unit/Assets/Manager/ExistsCest.php
+++ b/tests/unit/Assets/Manager/ExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
 use UnitTester;
diff --git a/tests/unit/Assets/Manager/GetCollectionsCest.php b/tests/unit/Assets/Manager/GetCollectionsCest.php
index 9f1d15456c1..a2fc1f85f46 100644
--- a/tests/unit/Assets/Manager/GetCollectionsCest.php
+++ b/tests/unit/Assets/Manager/GetCollectionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Countable;
 use Iterator;
diff --git a/tests/unit/Assets/Manager/GetSetCest.php b/tests/unit/Assets/Manager/GetSetCest.php
index 4c1b0f2bd02..b155fef6dc6 100644
--- a/tests/unit/Assets/Manager/GetSetCest.php
+++ b/tests/unit/Assets/Manager/GetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Countable;
 use Iterator;
diff --git a/tests/unit/Assets/Manager/GetSetDICest.php b/tests/unit/Assets/Manager/GetSetDICest.php
index f500114f5af..3c69abdb719 100644
--- a/tests/unit/Assets/Manager/GetSetDICest.php
+++ b/tests/unit/Assets/Manager/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
 use Phalcon\Di;
diff --git a/tests/unit/Assets/Manager/GetSetOptionsCest.php b/tests/unit/Assets/Manager/GetSetOptionsCest.php
index 68f81ea631a..ecbe79f543f 100644
--- a/tests/unit/Assets/Manager/GetSetOptionsCest.php
+++ b/tests/unit/Assets/Manager/GetSetOptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Codeception\Example;
 use Phalcon\Assets\Manager;
diff --git a/tests/unit/Assets/Manager/OutputCssCest.php b/tests/unit/Assets/Manager/OutputCssCest.php
index 8d5cc84a771..4e6a136990f 100644
--- a/tests/unit/Assets/Manager/OutputCssCest.php
+++ b/tests/unit/Assets/Manager/OutputCssCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Asset\Css;
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Assets\CustomTag;
-use Phalcon\Test\Fixtures\Assets\TrimFilter;
-use Phalcon\Test\Fixtures\Assets\UppercaseFilter;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Assets\CustomTag;
+use Phalcon\Tests\Fixtures\Assets\TrimFilter;
+use Phalcon\Tests\Fixtures\Assets\UppercaseFilter;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class OutputCssCest
diff --git a/tests/unit/Assets/Manager/OutputInlineCest.php b/tests/unit/Assets/Manager/OutputInlineCest.php
index c6c5d86ac6d..d7f355ffdda 100644
--- a/tests/unit/Assets/Manager/OutputInlineCest.php
+++ b/tests/unit/Assets/Manager/OutputInlineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Assets/Manager/OutputInlineCssCest.php b/tests/unit/Assets/Manager/OutputInlineCssCest.php
index 2dfedca8527..07257350d15 100644
--- a/tests/unit/Assets/Manager/OutputInlineCssCest.php
+++ b/tests/unit/Assets/Manager/OutputInlineCssCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Assets/Manager/OutputInlineJsCest.php b/tests/unit/Assets/Manager/OutputInlineJsCest.php
index 8e81a277a11..d18fa959cd9 100644
--- a/tests/unit/Assets/Manager/OutputInlineJsCest.php
+++ b/tests/unit/Assets/Manager/OutputInlineJsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Assets/Manager/OutputJsCest.php b/tests/unit/Assets/Manager/OutputJsCest.php
index 3922dacb1f9..5ae08480c80 100644
--- a/tests/unit/Assets/Manager/OutputJsCest.php
+++ b/tests/unit/Assets/Manager/OutputJsCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Asset\Js;
 use Phalcon\Assets\Filters\Jsmin;
 use Phalcon\Assets\Filters\None;
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Assets\CustomTag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Assets\CustomTag;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Assets/Manager/SetAutoVersionCest.php b/tests/unit/Assets/Manager/SetAutoVersionCest.php
index 1f8548dffb1..24ca95212d7 100644
--- a/tests/unit/Assets/Manager/SetAutoVersionCest.php
+++ b/tests/unit/Assets/Manager/SetAutoVersionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Assets/Manager/UseImplicitOutputCest.php b/tests/unit/Assets/Manager/UseImplicitOutputCest.php
index b805a9cfd3e..d7d68cbe8bd 100644
--- a/tests/unit/Assets/Manager/UseImplicitOutputCest.php
+++ b/tests/unit/Assets/Manager/UseImplicitOutputCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Assets\Manager;
+namespace Phalcon\Tests\Unit\Assets\Manager;
 
 use Phalcon\Assets\Manager;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/ClearCest.php b/tests/unit/Collection/Collection/ClearCest.php
index 10712c99aa3..bcee81b84bd 100644
--- a/tests/unit/Collection/Collection/ClearCest.php
+++ b/tests/unit/Collection/Collection/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/ConstructCest.php b/tests/unit/Collection/Collection/ConstructCest.php
index dc3867078b6..896c41c3e67 100644
--- a/tests/unit/Collection/Collection/ConstructCest.php
+++ b/tests/unit/Collection/Collection/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/CountCest.php b/tests/unit/Collection/Collection/CountCest.php
index c2fff3b26ec..39e48fb47c6 100644
--- a/tests/unit/Collection/Collection/CountCest.php
+++ b/tests/unit/Collection/Collection/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/GetCest.php b/tests/unit/Collection/Collection/GetCest.php
index 3b4ac797d37..39863fe3e4b 100644
--- a/tests/unit/Collection/Collection/GetCest.php
+++ b/tests/unit/Collection/Collection/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Codeception\Example;
 use Phalcon\Collection;
diff --git a/tests/unit/Collection/Collection/GetIteratorCest.php b/tests/unit/Collection/Collection/GetIteratorCest.php
index 82b2e330163..4689aeebd70 100644
--- a/tests/unit/Collection/Collection/GetIteratorCest.php
+++ b/tests/unit/Collection/Collection/GetIteratorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/GetKeysCest.php b/tests/unit/Collection/Collection/GetKeysCest.php
index 1e474ed9c3b..baf6d739351 100644
--- a/tests/unit/Collection/Collection/GetKeysCest.php
+++ b/tests/unit/Collection/Collection/GetKeysCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/GetValuesCest.php b/tests/unit/Collection/Collection/GetValuesCest.php
index ffcac4ea865..be11d811e0a 100644
--- a/tests/unit/Collection/Collection/GetValuesCest.php
+++ b/tests/unit/Collection/Collection/GetValuesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/HasCest.php b/tests/unit/Collection/Collection/HasCest.php
index 33ed8344b57..651c4498234 100644
--- a/tests/unit/Collection/Collection/HasCest.php
+++ b/tests/unit/Collection/Collection/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/InitCest.php b/tests/unit/Collection/Collection/InitCest.php
index c4e322195e4..12802b5ce67 100644
--- a/tests/unit/Collection/Collection/InitCest.php
+++ b/tests/unit/Collection/Collection/InitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/JsonSerializeCest.php b/tests/unit/Collection/Collection/JsonSerializeCest.php
index dcf58ff0c77..382f974a5bb 100644
--- a/tests/unit/Collection/Collection/JsonSerializeCest.php
+++ b/tests/unit/Collection/Collection/JsonSerializeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
-use Phalcon\Test\Fixtures\Helper\JsonFixture;
+use Phalcon\Tests\Fixtures\Helper\JsonFixture;
 use UnitTester;
 
 class JsonSerializeCest
diff --git a/tests/unit/Collection/Collection/RemoveCest.php b/tests/unit/Collection/Collection/RemoveCest.php
index 15011493493..bd7d2d5a722 100644
--- a/tests/unit/Collection/Collection/RemoveCest.php
+++ b/tests/unit/Collection/Collection/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/SerializeCest.php b/tests/unit/Collection/Collection/SerializeCest.php
index 3856bc79a10..78a2c39ddb9 100644
--- a/tests/unit/Collection/Collection/SerializeCest.php
+++ b/tests/unit/Collection/Collection/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/SetCest.php b/tests/unit/Collection/Collection/SetCest.php
index 2b5509d935a..a3f61138910 100644
--- a/tests/unit/Collection/Collection/SetCest.php
+++ b/tests/unit/Collection/Collection/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/ToArrayCest.php b/tests/unit/Collection/Collection/ToArrayCest.php
index 233192a6ee4..ead9bc49f0a 100644
--- a/tests/unit/Collection/Collection/ToArrayCest.php
+++ b/tests/unit/Collection/Collection/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/ToJsonCest.php b/tests/unit/Collection/Collection/ToJsonCest.php
index 0a2ea394e16..056c6f9f551 100644
--- a/tests/unit/Collection/Collection/ToJsonCest.php
+++ b/tests/unit/Collection/Collection/ToJsonCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/Collection/UnserializeCest.php b/tests/unit/Collection/Collection/UnserializeCest.php
index 55b131e8fd9..6ca4c488ccc 100644
--- a/tests/unit/Collection/Collection/UnserializeCest.php
+++ b/tests/unit/Collection/Collection/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\Collection;
+namespace Phalcon\Tests\Unit\Collection\Collection;
 
 use Phalcon\Collection;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/ClearCest.php b/tests/unit/Collection/ReadOnly/ClearCest.php
index 38b625ee385..0db7f8d734e 100644
--- a/tests/unit/Collection/ReadOnly/ClearCest.php
+++ b/tests/unit/Collection/ReadOnly/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/ConstructCest.php b/tests/unit/Collection/ReadOnly/ConstructCest.php
index fa02b6e8d28..64f05996f0c 100644
--- a/tests/unit/Collection/ReadOnly/ConstructCest.php
+++ b/tests/unit/Collection/ReadOnly/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/CountCest.php b/tests/unit/Collection/ReadOnly/CountCest.php
index 4e482166685..8a6aeceab95 100644
--- a/tests/unit/Collection/ReadOnly/CountCest.php
+++ b/tests/unit/Collection/ReadOnly/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/GetCest.php b/tests/unit/Collection/ReadOnly/GetCest.php
index b56ddd42379..be6ef1a40f2 100644
--- a/tests/unit/Collection/ReadOnly/GetCest.php
+++ b/tests/unit/Collection/ReadOnly/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/GetIteratorCest.php b/tests/unit/Collection/ReadOnly/GetIteratorCest.php
index 87447b69ac0..30de7dea711 100644
--- a/tests/unit/Collection/ReadOnly/GetIteratorCest.php
+++ b/tests/unit/Collection/ReadOnly/GetIteratorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/HasCest.php b/tests/unit/Collection/ReadOnly/HasCest.php
index 0ea7170a931..f4fed8b5fff 100644
--- a/tests/unit/Collection/ReadOnly/HasCest.php
+++ b/tests/unit/Collection/ReadOnly/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/InitCest.php b/tests/unit/Collection/ReadOnly/InitCest.php
index 6094b4dfc85..f9237737f47 100644
--- a/tests/unit/Collection/ReadOnly/InitCest.php
+++ b/tests/unit/Collection/ReadOnly/InitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/JsonSerializeCest.php b/tests/unit/Collection/ReadOnly/JsonSerializeCest.php
index 5db5f017770..3f42074539c 100644
--- a/tests/unit/Collection/ReadOnly/JsonSerializeCest.php
+++ b/tests/unit/Collection/ReadOnly/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/RemoveCest.php b/tests/unit/Collection/ReadOnly/RemoveCest.php
index d90c9d042e4..ea65f2fabed 100644
--- a/tests/unit/Collection/ReadOnly/RemoveCest.php
+++ b/tests/unit/Collection/ReadOnly/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\Exception;
 use Phalcon\Collection\ReadOnly;
diff --git a/tests/unit/Collection/ReadOnly/SerializeCest.php b/tests/unit/Collection/ReadOnly/SerializeCest.php
index 2537edf5b81..00102cfac54 100644
--- a/tests/unit/Collection/ReadOnly/SerializeCest.php
+++ b/tests/unit/Collection/ReadOnly/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/SetCest.php b/tests/unit/Collection/ReadOnly/SetCest.php
index be455757052..5e5fcf72fee 100644
--- a/tests/unit/Collection/ReadOnly/SetCest.php
+++ b/tests/unit/Collection/ReadOnly/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\Exception;
 use Phalcon\Collection\ReadOnly;
diff --git a/tests/unit/Collection/ReadOnly/ToArrayCest.php b/tests/unit/Collection/ReadOnly/ToArrayCest.php
index 8a11366190a..2bbeb32f554 100644
--- a/tests/unit/Collection/ReadOnly/ToArrayCest.php
+++ b/tests/unit/Collection/ReadOnly/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/ToJsonCest.php b/tests/unit/Collection/ReadOnly/ToJsonCest.php
index 76fbeefe666..d39faf1910b 100644
--- a/tests/unit/Collection/ReadOnly/ToJsonCest.php
+++ b/tests/unit/Collection/ReadOnly/ToJsonCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Collection/ReadOnly/UnserializeCest.php b/tests/unit/Collection/ReadOnly/UnserializeCest.php
index 5fe8df714a1..a5959fa2c96 100644
--- a/tests/unit/Collection/ReadOnly/UnserializeCest.php
+++ b/tests/unit/Collection/ReadOnly/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Collection\ReadOnly;
+namespace Phalcon\Tests\Unit\Collection\ReadOnly;
 
 use Phalcon\Collection\ReadOnly;
 use UnitTester;
diff --git a/tests/unit/Config/Adapter/Grouped/ConstructCest.php b/tests/unit/Config/Adapter/Grouped/ConstructCest.php
index d09d6b8c298..5bfc7bb2338 100644
--- a/tests/unit/Config/Adapter/Grouped/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Grouped/ConstructCest.php
@@ -13,12 +13,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
 use Phalcon\Config;
 use Phalcon\Config\Adapter\Grouped;
 use Phalcon\Config\Exception;
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Config/Adapter/Grouped/CountCest.php b/tests/unit/Config/Adapter/Grouped/CountCest.php
index 3c936fe7805..7422b1339c9 100644
--- a/tests/unit/Config/Adapter/Grouped/CountCest.php
+++ b/tests/unit/Config/Adapter/Grouped/CountCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class CountCest
diff --git a/tests/unit/Config/Adapter/Grouped/GetCest.php b/tests/unit/Config/Adapter/Grouped/GetCest.php
index cee6468fe7c..690c4e1cdfd 100644
--- a/tests/unit/Config/Adapter/Grouped/GetCest.php
+++ b/tests/unit/Config/Adapter/Grouped/GetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetCest
diff --git a/tests/unit/Config/Adapter/Grouped/GetPathDelimiterCest.php b/tests/unit/Config/Adapter/Grouped/GetPathDelimiterCest.php
index 02dff851abd..f3fad401702 100644
--- a/tests/unit/Config/Adapter/Grouped/GetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Grouped/GetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Grouped/MergeCest.php b/tests/unit/Config/Adapter/Grouped/MergeCest.php
index 315f44efa03..fb3766ccd58 100644
--- a/tests/unit/Config/Adapter/Grouped/MergeCest.php
+++ b/tests/unit/Config/Adapter/Grouped/MergeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class MergeCest
diff --git a/tests/unit/Config/Adapter/Grouped/OffsetExistsCest.php b/tests/unit/Config/Adapter/Grouped/OffsetExistsCest.php
index caeec842000..5527cb0e33a 100644
--- a/tests/unit/Config/Adapter/Grouped/OffsetExistsCest.php
+++ b/tests/unit/Config/Adapter/Grouped/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetExistsCest
diff --git a/tests/unit/Config/Adapter/Grouped/OffsetGetCest.php b/tests/unit/Config/Adapter/Grouped/OffsetGetCest.php
index 22d2bcad777..20758102165 100644
--- a/tests/unit/Config/Adapter/Grouped/OffsetGetCest.php
+++ b/tests/unit/Config/Adapter/Grouped/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetGetCest
diff --git a/tests/unit/Config/Adapter/Grouped/OffsetSetCest.php b/tests/unit/Config/Adapter/Grouped/OffsetSetCest.php
index 3e98c31f8bb..1af86d2c711 100644
--- a/tests/unit/Config/Adapter/Grouped/OffsetSetCest.php
+++ b/tests/unit/Config/Adapter/Grouped/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetSetCest
diff --git a/tests/unit/Config/Adapter/Grouped/OffsetUnsetCest.php b/tests/unit/Config/Adapter/Grouped/OffsetUnsetCest.php
index 618e7d95062..12df326dc1e 100644
--- a/tests/unit/Config/Adapter/Grouped/OffsetUnsetCest.php
+++ b/tests/unit/Config/Adapter/Grouped/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetUnsetCest
diff --git a/tests/unit/Config/Adapter/Grouped/PathCest.php b/tests/unit/Config/Adapter/Grouped/PathCest.php
index 2448cbb10fe..b3b2c849c3e 100644
--- a/tests/unit/Config/Adapter/Grouped/PathCest.php
+++ b/tests/unit/Config/Adapter/Grouped/PathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class PathCest
diff --git a/tests/unit/Config/Adapter/Grouped/SetPathDelimiterCest.php b/tests/unit/Config/Adapter/Grouped/SetPathDelimiterCest.php
index 3486a8017f4..d3a79f76f15 100644
--- a/tests/unit/Config/Adapter/Grouped/SetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Grouped/SetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class SetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Grouped/ToArrayCest.php b/tests/unit/Config/Adapter/Grouped/ToArrayCest.php
index 41999330068..cc0f410975d 100644
--- a/tests/unit/Config/Adapter/Grouped/ToArrayCest.php
+++ b/tests/unit/Config/Adapter/Grouped/ToArrayCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Grouped;
+namespace Phalcon\Tests\Unit\Config\Adapter\Grouped;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ToArrayCest
diff --git a/tests/unit/Config/Adapter/Ini/ConstructCest.php b/tests/unit/Config/Adapter/Ini/ConstructCest.php
index b46eb379fb0..8257f8afeb5 100644
--- a/tests/unit/Config/Adapter/Ini/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Ini/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
 use Phalcon\Config\Adapter\Ini;
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Config/Adapter/Ini/CountCest.php b/tests/unit/Config/Adapter/Ini/CountCest.php
index 285fe3ddb22..7e02c761b75 100644
--- a/tests/unit/Config/Adapter/Ini/CountCest.php
+++ b/tests/unit/Config/Adapter/Ini/CountCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class CountCest
diff --git a/tests/unit/Config/Adapter/Ini/GetCest.php b/tests/unit/Config/Adapter/Ini/GetCest.php
index 2faac1bc837..57e2398eab7 100644
--- a/tests/unit/Config/Adapter/Ini/GetCest.php
+++ b/tests/unit/Config/Adapter/Ini/GetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetCest
diff --git a/tests/unit/Config/Adapter/Ini/GetPathDelimiterCest.php b/tests/unit/Config/Adapter/Ini/GetPathDelimiterCest.php
index cd64d232b0c..ab6e7fd71eb 100644
--- a/tests/unit/Config/Adapter/Ini/GetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Ini/GetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Ini/MergeCest.php b/tests/unit/Config/Adapter/Ini/MergeCest.php
index 6fc3a64b711..ae7af2f90a2 100644
--- a/tests/unit/Config/Adapter/Ini/MergeCest.php
+++ b/tests/unit/Config/Adapter/Ini/MergeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class MergeCest
diff --git a/tests/unit/Config/Adapter/Ini/OffsetExistsCest.php b/tests/unit/Config/Adapter/Ini/OffsetExistsCest.php
index 62be8e93c78..36ab5b6d259 100644
--- a/tests/unit/Config/Adapter/Ini/OffsetExistsCest.php
+++ b/tests/unit/Config/Adapter/Ini/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetExistsCest
diff --git a/tests/unit/Config/Adapter/Ini/OffsetGetCest.php b/tests/unit/Config/Adapter/Ini/OffsetGetCest.php
index 27d6ff875ba..8570c62ce91 100644
--- a/tests/unit/Config/Adapter/Ini/OffsetGetCest.php
+++ b/tests/unit/Config/Adapter/Ini/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetGetCest
diff --git a/tests/unit/Config/Adapter/Ini/OffsetSetCest.php b/tests/unit/Config/Adapter/Ini/OffsetSetCest.php
index bfe433ad680..d3838e62bcf 100644
--- a/tests/unit/Config/Adapter/Ini/OffsetSetCest.php
+++ b/tests/unit/Config/Adapter/Ini/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetSetCest
diff --git a/tests/unit/Config/Adapter/Ini/OffsetUnsetCest.php b/tests/unit/Config/Adapter/Ini/OffsetUnsetCest.php
index 12e14d5ed43..4e59cd6313d 100644
--- a/tests/unit/Config/Adapter/Ini/OffsetUnsetCest.php
+++ b/tests/unit/Config/Adapter/Ini/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetUnsetCest
diff --git a/tests/unit/Config/Adapter/Ini/PathCest.php b/tests/unit/Config/Adapter/Ini/PathCest.php
index 751d133eab2..a1d32d6f7c1 100644
--- a/tests/unit/Config/Adapter/Ini/PathCest.php
+++ b/tests/unit/Config/Adapter/Ini/PathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class PathCest
diff --git a/tests/unit/Config/Adapter/Ini/SetPathDelimiterCest.php b/tests/unit/Config/Adapter/Ini/SetPathDelimiterCest.php
index dd4655e8da8..750c7eb4745 100644
--- a/tests/unit/Config/Adapter/Ini/SetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Ini/SetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class SetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Ini/ToArrayCest.php b/tests/unit/Config/Adapter/Ini/ToArrayCest.php
index 709a8312645..3948e252c0d 100644
--- a/tests/unit/Config/Adapter/Ini/ToArrayCest.php
+++ b/tests/unit/Config/Adapter/Ini/ToArrayCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Ini;
+namespace Phalcon\Tests\Unit\Config\Adapter\Ini;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ToArrayCest
diff --git a/tests/unit/Config/Adapter/Json/ConstructCest.php b/tests/unit/Config/Adapter/Json/ConstructCest.php
index 3028948681d..cad8d45fbfd 100644
--- a/tests/unit/Config/Adapter/Json/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Json/ConstructCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Config/Adapter/Json/CountCest.php b/tests/unit/Config/Adapter/Json/CountCest.php
index 28af35dccf8..38643db6387 100644
--- a/tests/unit/Config/Adapter/Json/CountCest.php
+++ b/tests/unit/Config/Adapter/Json/CountCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class CountCest
diff --git a/tests/unit/Config/Adapter/Json/GetCest.php b/tests/unit/Config/Adapter/Json/GetCest.php
index 9f1a33c7f47..dbabf850d13 100644
--- a/tests/unit/Config/Adapter/Json/GetCest.php
+++ b/tests/unit/Config/Adapter/Json/GetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetCest
diff --git a/tests/unit/Config/Adapter/Json/GetPathDelimiterCest.php b/tests/unit/Config/Adapter/Json/GetPathDelimiterCest.php
index bcb7f0f3219..9d89000dc7d 100644
--- a/tests/unit/Config/Adapter/Json/GetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Json/GetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Json/MergeCest.php b/tests/unit/Config/Adapter/Json/MergeCest.php
index 0d86048c119..4e59d583590 100644
--- a/tests/unit/Config/Adapter/Json/MergeCest.php
+++ b/tests/unit/Config/Adapter/Json/MergeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class MergeCest
diff --git a/tests/unit/Config/Adapter/Json/OffsetExistsCest.php b/tests/unit/Config/Adapter/Json/OffsetExistsCest.php
index 3e653fd71c9..64f5849d309 100644
--- a/tests/unit/Config/Adapter/Json/OffsetExistsCest.php
+++ b/tests/unit/Config/Adapter/Json/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetExistsCest
diff --git a/tests/unit/Config/Adapter/Json/OffsetGetCest.php b/tests/unit/Config/Adapter/Json/OffsetGetCest.php
index 2979273f074..fef18cd7f93 100644
--- a/tests/unit/Config/Adapter/Json/OffsetGetCest.php
+++ b/tests/unit/Config/Adapter/Json/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetGetCest
diff --git a/tests/unit/Config/Adapter/Json/OffsetSetCest.php b/tests/unit/Config/Adapter/Json/OffsetSetCest.php
index 7e7de961b69..3d900fae99a 100644
--- a/tests/unit/Config/Adapter/Json/OffsetSetCest.php
+++ b/tests/unit/Config/Adapter/Json/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetSetCest
diff --git a/tests/unit/Config/Adapter/Json/OffsetUnsetCest.php b/tests/unit/Config/Adapter/Json/OffsetUnsetCest.php
index bfc88b32bc1..a49adccf5a4 100644
--- a/tests/unit/Config/Adapter/Json/OffsetUnsetCest.php
+++ b/tests/unit/Config/Adapter/Json/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetUnsetCest
diff --git a/tests/unit/Config/Adapter/Json/PathCest.php b/tests/unit/Config/Adapter/Json/PathCest.php
index a33426efa1e..8e74bd1f8cd 100644
--- a/tests/unit/Config/Adapter/Json/PathCest.php
+++ b/tests/unit/Config/Adapter/Json/PathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class PathCest
diff --git a/tests/unit/Config/Adapter/Json/SetPathDelimiterCest.php b/tests/unit/Config/Adapter/Json/SetPathDelimiterCest.php
index dd923715d2e..1ba7f31b7c5 100644
--- a/tests/unit/Config/Adapter/Json/SetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Json/SetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class SetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Json/ToArrayCest.php b/tests/unit/Config/Adapter/Json/ToArrayCest.php
index 42f4f74c94d..f9b3ade0e97 100644
--- a/tests/unit/Config/Adapter/Json/ToArrayCest.php
+++ b/tests/unit/Config/Adapter/Json/ToArrayCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Json;
+namespace Phalcon\Tests\Unit\Config\Adapter\Json;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ToArrayCest
diff --git a/tests/unit/Config/Adapter/Php/ConstructCest.php b/tests/unit/Config/Adapter/Php/ConstructCest.php
index e440eedfcac..169895b84a3 100644
--- a/tests/unit/Config/Adapter/Php/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Php/ConstructCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Config/Adapter/Php/CountCest.php b/tests/unit/Config/Adapter/Php/CountCest.php
index e1d866fa635..3c7a819c324 100644
--- a/tests/unit/Config/Adapter/Php/CountCest.php
+++ b/tests/unit/Config/Adapter/Php/CountCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class CountCest
diff --git a/tests/unit/Config/Adapter/Php/GetCest.php b/tests/unit/Config/Adapter/Php/GetCest.php
index 09fbd333666..aeadf4aa114 100644
--- a/tests/unit/Config/Adapter/Php/GetCest.php
+++ b/tests/unit/Config/Adapter/Php/GetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetCest
diff --git a/tests/unit/Config/Adapter/Php/GetPathDelimiterCest.php b/tests/unit/Config/Adapter/Php/GetPathDelimiterCest.php
index d6ee48cf352..d0ebd921d3c 100644
--- a/tests/unit/Config/Adapter/Php/GetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Php/GetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Php/MergeCest.php b/tests/unit/Config/Adapter/Php/MergeCest.php
index deb8b6d9b13..740262f8683 100644
--- a/tests/unit/Config/Adapter/Php/MergeCest.php
+++ b/tests/unit/Config/Adapter/Php/MergeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class MergeCest
diff --git a/tests/unit/Config/Adapter/Php/OffsetExistsCest.php b/tests/unit/Config/Adapter/Php/OffsetExistsCest.php
index c0083a5d5fd..6d0702fe70b 100644
--- a/tests/unit/Config/Adapter/Php/OffsetExistsCest.php
+++ b/tests/unit/Config/Adapter/Php/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetExistsCest
diff --git a/tests/unit/Config/Adapter/Php/OffsetGetCest.php b/tests/unit/Config/Adapter/Php/OffsetGetCest.php
index 2598fc1850b..68f83d43b18 100644
--- a/tests/unit/Config/Adapter/Php/OffsetGetCest.php
+++ b/tests/unit/Config/Adapter/Php/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetGetCest
diff --git a/tests/unit/Config/Adapter/Php/OffsetSetCest.php b/tests/unit/Config/Adapter/Php/OffsetSetCest.php
index 27cf7ee7a61..8fcc5caca18 100644
--- a/tests/unit/Config/Adapter/Php/OffsetSetCest.php
+++ b/tests/unit/Config/Adapter/Php/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetSetCest
diff --git a/tests/unit/Config/Adapter/Php/OffsetUnsetCest.php b/tests/unit/Config/Adapter/Php/OffsetUnsetCest.php
index 8c5c169ce63..8c73afbfe2f 100644
--- a/tests/unit/Config/Adapter/Php/OffsetUnsetCest.php
+++ b/tests/unit/Config/Adapter/Php/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetUnsetCest
diff --git a/tests/unit/Config/Adapter/Php/PathCest.php b/tests/unit/Config/Adapter/Php/PathCest.php
index 851d0599821..1ab9d2748ab 100644
--- a/tests/unit/Config/Adapter/Php/PathCest.php
+++ b/tests/unit/Config/Adapter/Php/PathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class PathCest
diff --git a/tests/unit/Config/Adapter/Php/SetPathDelimiterCest.php b/tests/unit/Config/Adapter/Php/SetPathDelimiterCest.php
index 525d22556a5..434eeec75a4 100644
--- a/tests/unit/Config/Adapter/Php/SetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Php/SetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class SetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Php/ToArrayCest.php b/tests/unit/Config/Adapter/Php/ToArrayCest.php
index b3e41ae5693..39e6168467c 100644
--- a/tests/unit/Config/Adapter/Php/ToArrayCest.php
+++ b/tests/unit/Config/Adapter/Php/ToArrayCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Php;
+namespace Phalcon\Tests\Unit\Config\Adapter\Php;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ToArrayCest
diff --git a/tests/unit/Config/Adapter/Yaml/ConstructCest.php b/tests/unit/Config/Adapter/Yaml/ConstructCest.php
index c2e07850bba..b68319f484f 100644
--- a/tests/unit/Config/Adapter/Yaml/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Yaml/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
 use Phalcon\Config\Adapter\Yaml;
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Config/Adapter/Yaml/CountCest.php b/tests/unit/Config/Adapter/Yaml/CountCest.php
index 06f713f3197..a69283158ed 100644
--- a/tests/unit/Config/Adapter/Yaml/CountCest.php
+++ b/tests/unit/Config/Adapter/Yaml/CountCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class CountCest
diff --git a/tests/unit/Config/Adapter/Yaml/GetCest.php b/tests/unit/Config/Adapter/Yaml/GetCest.php
index ac506e0751a..d8d1efb3828 100644
--- a/tests/unit/Config/Adapter/Yaml/GetCest.php
+++ b/tests/unit/Config/Adapter/Yaml/GetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetCest
diff --git a/tests/unit/Config/Adapter/Yaml/GetPathDelimiterCest.php b/tests/unit/Config/Adapter/Yaml/GetPathDelimiterCest.php
index c95da8d89b8..c5395c3beeb 100644
--- a/tests/unit/Config/Adapter/Yaml/GetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Yaml/GetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Yaml/MergeCest.php b/tests/unit/Config/Adapter/Yaml/MergeCest.php
index db753c9c06a..2e55ad0ea92 100644
--- a/tests/unit/Config/Adapter/Yaml/MergeCest.php
+++ b/tests/unit/Config/Adapter/Yaml/MergeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class MergeCest
diff --git a/tests/unit/Config/Adapter/Yaml/OffsetExistsCest.php b/tests/unit/Config/Adapter/Yaml/OffsetExistsCest.php
index a49dcf358ba..4de2ed763a2 100644
--- a/tests/unit/Config/Adapter/Yaml/OffsetExistsCest.php
+++ b/tests/unit/Config/Adapter/Yaml/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetExistsCest
diff --git a/tests/unit/Config/Adapter/Yaml/OffsetGetCest.php b/tests/unit/Config/Adapter/Yaml/OffsetGetCest.php
index d0edd8bbf81..11a61234747 100644
--- a/tests/unit/Config/Adapter/Yaml/OffsetGetCest.php
+++ b/tests/unit/Config/Adapter/Yaml/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetGetCest
diff --git a/tests/unit/Config/Adapter/Yaml/OffsetSetCest.php b/tests/unit/Config/Adapter/Yaml/OffsetSetCest.php
index a751f518836..afeb4a5fcd4 100644
--- a/tests/unit/Config/Adapter/Yaml/OffsetSetCest.php
+++ b/tests/unit/Config/Adapter/Yaml/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetSetCest
diff --git a/tests/unit/Config/Adapter/Yaml/OffsetUnsetCest.php b/tests/unit/Config/Adapter/Yaml/OffsetUnsetCest.php
index 995e438a67d..40e89e45670 100644
--- a/tests/unit/Config/Adapter/Yaml/OffsetUnsetCest.php
+++ b/tests/unit/Config/Adapter/Yaml/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetUnsetCest
diff --git a/tests/unit/Config/Adapter/Yaml/PathCest.php b/tests/unit/Config/Adapter/Yaml/PathCest.php
index 7559f5628e2..f7be1598d9d 100644
--- a/tests/unit/Config/Adapter/Yaml/PathCest.php
+++ b/tests/unit/Config/Adapter/Yaml/PathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class PathCest
diff --git a/tests/unit/Config/Adapter/Yaml/SetPathDelimiterCest.php b/tests/unit/Config/Adapter/Yaml/SetPathDelimiterCest.php
index ddd4ec7ef7f..cae740fe352 100644
--- a/tests/unit/Config/Adapter/Yaml/SetPathDelimiterCest.php
+++ b/tests/unit/Config/Adapter/Yaml/SetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class SetPathDelimiterCest
diff --git a/tests/unit/Config/Adapter/Yaml/ToArrayCest.php b/tests/unit/Config/Adapter/Yaml/ToArrayCest.php
index 3efbc99ffb0..bf947826670 100644
--- a/tests/unit/Config/Adapter/Yaml/ToArrayCest.php
+++ b/tests/unit/Config/Adapter/Yaml/ToArrayCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Adapter\Yaml;
+namespace Phalcon\Tests\Unit\Config\Adapter\Yaml;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ToArrayCest
diff --git a/tests/unit/Config/Config/ConfigCest.php b/tests/unit/Config/Config/ConfigCest.php
index 0a6cdb0531f..09847352338 100644
--- a/tests/unit/Config/Config/ConfigCest.php
+++ b/tests/unit/Config/Config/ConfigCest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
 use Phalcon\Config;
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ConfigCest
diff --git a/tests/unit/Config/Config/ConstructCest.php b/tests/unit/Config/Config/ConstructCest.php
index 6aeeeb09494..36a53466a4a 100644
--- a/tests/unit/Config/Config/ConstructCest.php
+++ b/tests/unit/Config/Config/ConstructCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Config/Config/CountCest.php b/tests/unit/Config/Config/CountCest.php
index 3e5ea45ef94..a8f8b9836ec 100644
--- a/tests/unit/Config/Config/CountCest.php
+++ b/tests/unit/Config/Config/CountCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class CountCest
diff --git a/tests/unit/Config/Config/GetCest.php b/tests/unit/Config/Config/GetCest.php
index c913227b997..46f02beb700 100644
--- a/tests/unit/Config/Config/GetCest.php
+++ b/tests/unit/Config/Config/GetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetCest
diff --git a/tests/unit/Config/Config/GetPathDelimiterCest.php b/tests/unit/Config/Config/GetPathDelimiterCest.php
index 1e2b97b68ee..c5a6a0b73ee 100644
--- a/tests/unit/Config/Config/GetPathDelimiterCest.php
+++ b/tests/unit/Config/Config/GetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class GetPathDelimiterCest
diff --git a/tests/unit/Config/Config/MergeCest.php b/tests/unit/Config/Config/MergeCest.php
index dd5b0984c0c..db2a2df838d 100644
--- a/tests/unit/Config/Config/MergeCest.php
+++ b/tests/unit/Config/Config/MergeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
 use Phalcon\Config;
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class MergeCest
diff --git a/tests/unit/Config/Config/OffsetExistsCest.php b/tests/unit/Config/Config/OffsetExistsCest.php
index 0739a69eee5..78173f880bc 100644
--- a/tests/unit/Config/Config/OffsetExistsCest.php
+++ b/tests/unit/Config/Config/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetExistsCest
diff --git a/tests/unit/Config/Config/OffsetGetCest.php b/tests/unit/Config/Config/OffsetGetCest.php
index 46f43bba1bd..833b21285d4 100644
--- a/tests/unit/Config/Config/OffsetGetCest.php
+++ b/tests/unit/Config/Config/OffsetGetCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
 use Phalcon\Config;
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetGetCest
diff --git a/tests/unit/Config/Config/OffsetSetCest.php b/tests/unit/Config/Config/OffsetSetCest.php
index 15615b5a040..05e3a3251a5 100644
--- a/tests/unit/Config/Config/OffsetSetCest.php
+++ b/tests/unit/Config/Config/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetSetCest
diff --git a/tests/unit/Config/Config/OffsetUnsetCest.php b/tests/unit/Config/Config/OffsetUnsetCest.php
index 578b7a67a30..d64e34ccd82 100644
--- a/tests/unit/Config/Config/OffsetUnsetCest.php
+++ b/tests/unit/Config/Config/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class OffsetUnsetCest
diff --git a/tests/unit/Config/Config/PathCest.php b/tests/unit/Config/Config/PathCest.php
index 5d92369c3e6..c52356969ac 100644
--- a/tests/unit/Config/Config/PathCest.php
+++ b/tests/unit/Config/Config/PathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class PathCest
diff --git a/tests/unit/Config/Config/SetPathDelimiterCest.php b/tests/unit/Config/Config/SetPathDelimiterCest.php
index 35d42bfa11b..4729c50f124 100644
--- a/tests/unit/Config/Config/SetPathDelimiterCest.php
+++ b/tests/unit/Config/Config/SetPathDelimiterCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class SetPathDelimiterCest
diff --git a/tests/unit/Config/Config/ToArrayCest.php b/tests/unit/Config/Config/ToArrayCest.php
index 014a46d08d0..829b9728a57 100644
--- a/tests/unit/Config/Config/ToArrayCest.php
+++ b/tests/unit/Config/Config/ToArrayCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\Config;
+namespace Phalcon\Tests\Unit\Config\Config;
 
-use Phalcon\Test\Fixtures\Traits\ConfigTrait;
+use Phalcon\Tests\Fixtures\Traits\ConfigTrait;
 use UnitTester;
 
 class ToArrayCest
diff --git a/tests/unit/Config/ConfigFactory/LoadCest.php b/tests/unit/Config/ConfigFactory/LoadCest.php
index 29bbf57c8d0..3d4b87c4b51 100644
--- a/tests/unit/Config/ConfigFactory/LoadCest.php
+++ b/tests/unit/Config/ConfigFactory/LoadCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\ConfigFactory;
+namespace Phalcon\Tests\Unit\Config\ConfigFactory;
 
 use Phalcon\Config\Adapter\Ini;
 use Phalcon\Config\Adapter\Yaml;
 use Phalcon\Config\ConfigFactory;
 use Phalcon\Config\Exception;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Config/ConfigFactory/NewInstanceCest.php b/tests/unit/Config/ConfigFactory/NewInstanceCest.php
index 6825b3107c2..f07666d80c6 100644
--- a/tests/unit/Config/ConfigFactory/NewInstanceCest.php
+++ b/tests/unit/Config/ConfigFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Config\ConfigFactory;
+namespace Phalcon\Tests\Unit\Config\ConfigFactory;
 
 use Phalcon\Config\Adapter\Ini;
 use Phalcon\Config\Adapter\Json;
diff --git a/tests/unit/Container/ConstructCest.php b/tests/unit/Container/ConstructCest.php
index 16a4c0c2521..1e4abaaaaac 100644
--- a/tests/unit/Container/ConstructCest.php
+++ b/tests/unit/Container/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Container;
+namespace Phalcon\Tests\Unit\Container;
 
 use Phalcon\Container;
 use Phalcon\Di;
diff --git a/tests/unit/Container/GetCest.php b/tests/unit/Container/GetCest.php
index 898d93f4648..efb03a67496 100644
--- a/tests/unit/Container/GetCest.php
+++ b/tests/unit/Container/GetCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Container;
+namespace Phalcon\Tests\Unit\Container;
 
 use Phalcon\Container;
 use Phalcon\Escaper;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function spl_object_hash;
diff --git a/tests/unit/Container/HasCest.php b/tests/unit/Container/HasCest.php
index d7b419be8d7..c836002118d 100644
--- a/tests/unit/Container/HasCest.php
+++ b/tests/unit/Container/HasCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Container;
+namespace Phalcon\Tests\Unit\Container;
 
 use Phalcon\Container;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class HasCest
diff --git a/tests/unit/Crypt/ConstructCest.php b/tests/unit/Crypt/ConstructCest.php
index d14aceca631..a4dd6070b91 100644
--- a/tests/unit/Crypt/ConstructCest.php
+++ b/tests/unit/Crypt/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use UnitTester;
diff --git a/tests/unit/Crypt/DecryptBase64Cest.php b/tests/unit/Crypt/DecryptBase64Cest.php
index d65f6c571ec..9db2eb6dbc8 100644
--- a/tests/unit/Crypt/DecryptBase64Cest.php
+++ b/tests/unit/Crypt/DecryptBase64Cest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use Phalcon\Crypt\Mismatch;
diff --git a/tests/unit/Crypt/DecryptCest.php b/tests/unit/Crypt/DecryptCest.php
index 75485000892..31faa27619b 100644
--- a/tests/unit/Crypt/DecryptCest.php
+++ b/tests/unit/Crypt/DecryptCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use Phalcon\Crypt\Mismatch;
diff --git a/tests/unit/Crypt/EncryptBase64Cest.php b/tests/unit/Crypt/EncryptBase64Cest.php
index 9b94767bc0a..819e9a4cac5 100644
--- a/tests/unit/Crypt/EncryptBase64Cest.php
+++ b/tests/unit/Crypt/EncryptBase64Cest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use UnitTester;
diff --git a/tests/unit/Crypt/EncryptCest.php b/tests/unit/Crypt/EncryptCest.php
index 5f4a74110d6..e9efc08df97 100644
--- a/tests/unit/Crypt/EncryptCest.php
+++ b/tests/unit/Crypt/EncryptCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use Phalcon\Crypt\Exception;
diff --git a/tests/unit/Crypt/GetAuthDataCest.php b/tests/unit/Crypt/GetAuthDataCest.php
index f36ccfd9946..58bbc0f6ceb 100644
--- a/tests/unit/Crypt/GetAuthDataCest.php
+++ b/tests/unit/Crypt/GetAuthDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/GetAuthTagCest.php b/tests/unit/Crypt/GetAuthTagCest.php
index 3edf472bc25..6434d063e7f 100644
--- a/tests/unit/Crypt/GetAuthTagCest.php
+++ b/tests/unit/Crypt/GetAuthTagCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/GetAuthTagLengthCest.php b/tests/unit/Crypt/GetAuthTagLengthCest.php
index a31099c3fb0..6da52058527 100644
--- a/tests/unit/Crypt/GetAuthTagLengthCest.php
+++ b/tests/unit/Crypt/GetAuthTagLengthCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/GetAvailableCiphersCest.php b/tests/unit/Crypt/GetAvailableCiphersCest.php
index bcc96630c15..220af6b7158 100644
--- a/tests/unit/Crypt/GetAvailableCiphersCest.php
+++ b/tests/unit/Crypt/GetAvailableCiphersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use UnitTester;
diff --git a/tests/unit/Crypt/GetAvailableHashAlgosCest.php b/tests/unit/Crypt/GetAvailableHashAlgosCest.php
index a6f79bfcd45..096d19cbcd2 100644
--- a/tests/unit/Crypt/GetAvailableHashAlgosCest.php
+++ b/tests/unit/Crypt/GetAvailableHashAlgosCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use UnitTester;
diff --git a/tests/unit/Crypt/GetHashAlgoCest.php b/tests/unit/Crypt/GetHashAlgoCest.php
index 5347e65f13e..e3fd3654f0a 100644
--- a/tests/unit/Crypt/GetHashAlgoCest.php
+++ b/tests/unit/Crypt/GetHashAlgoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/GetKeyCest.php b/tests/unit/Crypt/GetKeyCest.php
index 2ef18738e32..e668bb4ecf0 100644
--- a/tests/unit/Crypt/GetKeyCest.php
+++ b/tests/unit/Crypt/GetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/GetSetCipherCest.php b/tests/unit/Crypt/GetSetCipherCest.php
index ce3422c13e9..9be3fe9026c 100644
--- a/tests/unit/Crypt/GetSetCipherCest.php
+++ b/tests/unit/Crypt/GetSetCipherCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use Phalcon\Crypt\Exception;
diff --git a/tests/unit/Crypt/GetSetKeyCest.php b/tests/unit/Crypt/GetSetKeyCest.php
index a0d1f2daf67..c2a3f7eb00f 100644
--- a/tests/unit/Crypt/GetSetKeyCest.php
+++ b/tests/unit/Crypt/GetSetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use UnitTester;
diff --git a/tests/unit/Crypt/SetAuthDataCest.php b/tests/unit/Crypt/SetAuthDataCest.php
index 8341f431490..8508f08f767 100644
--- a/tests/unit/Crypt/SetAuthDataCest.php
+++ b/tests/unit/Crypt/SetAuthDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/SetAuthTagCest.php b/tests/unit/Crypt/SetAuthTagCest.php
index 8563fdd7e7c..0f6b5685ed4 100644
--- a/tests/unit/Crypt/SetAuthTagCest.php
+++ b/tests/unit/Crypt/SetAuthTagCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/SetAuthTagLengthCest.php b/tests/unit/Crypt/SetAuthTagLengthCest.php
index 93b4a18356d..b8d81c3c6b2 100644
--- a/tests/unit/Crypt/SetAuthTagLengthCest.php
+++ b/tests/unit/Crypt/SetAuthTagLengthCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/SetHashAlgoCest.php b/tests/unit/Crypt/SetHashAlgoCest.php
index 52ddf7c14d5..de22a68ade7 100644
--- a/tests/unit/Crypt/SetHashAlgoCest.php
+++ b/tests/unit/Crypt/SetHashAlgoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/SetKeyCest.php b/tests/unit/Crypt/SetKeyCest.php
index 98cc33c01c9..ad04554514c 100644
--- a/tests/unit/Crypt/SetKeyCest.php
+++ b/tests/unit/Crypt/SetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use UnitTester;
 
diff --git a/tests/unit/Crypt/SetPaddingCest.php b/tests/unit/Crypt/SetPaddingCest.php
index d6bd476cd93..9275e909778 100644
--- a/tests/unit/Crypt/SetPaddingCest.php
+++ b/tests/unit/Crypt/SetPaddingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Crypt;
 use UnitTester;
diff --git a/tests/unit/Crypt/UseSigningCest.php b/tests/unit/Crypt/UseSigningCest.php
index a3aa165bd58..d1aca586576 100644
--- a/tests/unit/Crypt/UseSigningCest.php
+++ b/tests/unit/Crypt/UseSigningCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Crypt;
+namespace Phalcon\Tests\Unit\Crypt;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Di/AttemptCest.php b/tests/unit/Di/AttemptCest.php
index 1ab81f58ab5..2826f23e3c3 100644
--- a/tests/unit/Di/AttemptCest.php
+++ b/tests/unit/Di/AttemptCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Di\Service;
diff --git a/tests/unit/Di/ConstructCest.php b/tests/unit/Di/ConstructCest.php
index dcfb1ede702..7016beb189b 100644
--- a/tests/unit/Di/ConstructCest.php
+++ b/tests/unit/Di/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use UnitTester;
diff --git a/tests/unit/Di/DiCest.php b/tests/unit/Di/DiCest.php
index 840a1ab9cd1..55d25fcd60d 100644
--- a/tests/unit/Di/DiCest.php
+++ b/tests/unit/Di/DiCest.php
@@ -15,7 +15,7 @@
  +------------------------------------------------------------------------+
  */
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use InjectableComponent;
 use Phalcon\Config;
diff --git a/tests/unit/Di/Exception/ConstructCest.php b/tests/unit/Di/Exception/ConstructCest.php
index b21b580ed21..c40a918fc98 100644
--- a/tests/unit/Di/Exception/ConstructCest.php
+++ b/tests/unit/Di/Exception/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ContainerServiceNotFoundCest.php b/tests/unit/Di/Exception/ContainerServiceNotFoundCest.php
index 9cd48d015ed..b58c2e865db 100644
--- a/tests/unit/Di/Exception/ContainerServiceNotFoundCest.php
+++ b/tests/unit/Di/Exception/ContainerServiceNotFoundCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetCodeCest.php b/tests/unit/Di/Exception/GetCodeCest.php
index e55aae649bd..cf60d9cc11c 100644
--- a/tests/unit/Di/Exception/GetCodeCest.php
+++ b/tests/unit/Di/Exception/GetCodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetFileCest.php b/tests/unit/Di/Exception/GetFileCest.php
index 80cf3ce7e47..fff5e589dcf 100644
--- a/tests/unit/Di/Exception/GetFileCest.php
+++ b/tests/unit/Di/Exception/GetFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetLineCest.php b/tests/unit/Di/Exception/GetLineCest.php
index fdfbcd09557..fc3f4a66e92 100644
--- a/tests/unit/Di/Exception/GetLineCest.php
+++ b/tests/unit/Di/Exception/GetLineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetMessageCest.php b/tests/unit/Di/Exception/GetMessageCest.php
index 3e33a4b4e76..63c1740f9f7 100644
--- a/tests/unit/Di/Exception/GetMessageCest.php
+++ b/tests/unit/Di/Exception/GetMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetPreviousCest.php b/tests/unit/Di/Exception/GetPreviousCest.php
index 65b2cc4091f..084634662e2 100644
--- a/tests/unit/Di/Exception/GetPreviousCest.php
+++ b/tests/unit/Di/Exception/GetPreviousCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetTraceAsStringCest.php b/tests/unit/Di/Exception/GetTraceAsStringCest.php
index 6b888879b1d..e3307860147 100644
--- a/tests/unit/Di/Exception/GetTraceAsStringCest.php
+++ b/tests/unit/Di/Exception/GetTraceAsStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/GetTraceCest.php b/tests/unit/Di/Exception/GetTraceCest.php
index 009cd6e8462..3df8d7e01d7 100644
--- a/tests/unit/Di/Exception/GetTraceCest.php
+++ b/tests/unit/Di/Exception/GetTraceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/ConstructCest.php b/tests/unit/Di/Exception/ServiceResolutionException/ConstructCest.php
index 426a194e532..fe3004529be 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/ConstructCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/ContainerServiceNotFoundCest.php b/tests/unit/Di/Exception/ServiceResolutionException/ContainerServiceNotFoundCest.php
index 55249554de0..9678a254c3c 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/ContainerServiceNotFoundCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/ContainerServiceNotFoundCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetCodeCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetCodeCest.php
index c5b466ffefb..fe499246630 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetCodeCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetCodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetFileCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetFileCest.php
index 0f26555198d..9e4fe27ad67 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetFileCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetLineCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetLineCest.php
index 9e87c53d91d..ffd98cee3a2 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetLineCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetLineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetMessageCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetMessageCest.php
index 9a2e1336e45..93a0a98eb2b 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetMessageCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetPreviousCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetPreviousCest.php
index 5fb73a8250a..a5d5ebfde30 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetPreviousCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetPreviousCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetTraceAsStringCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetTraceAsStringCest.php
index 36cf39800a8..7a92542565c 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetTraceAsStringCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetTraceAsStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/GetTraceCest.php b/tests/unit/Di/Exception/ServiceResolutionException/GetTraceCest.php
index 495a5b6e0f3..6ce4185d19a 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/GetTraceCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/GetTraceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/ToStringCest.php b/tests/unit/Di/Exception/ServiceResolutionException/ToStringCest.php
index 068f5752a86..26ba5899434 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/ToStringCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ServiceResolutionException/WakeupCest.php b/tests/unit/Di/Exception/ServiceResolutionException/WakeupCest.php
index 47da0bdd21d..a28a1145b24 100644
--- a/tests/unit/Di/Exception/ServiceResolutionException/WakeupCest.php
+++ b/tests/unit/Di/Exception/ServiceResolutionException/WakeupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception\ServiceResolutionException;
+namespace Phalcon\Tests\Unit\Di\Exception\ServiceResolutionException;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/ToStringCest.php b/tests/unit/Di/Exception/ToStringCest.php
index a7b7936bf8f..b973ab910a3 100644
--- a/tests/unit/Di/Exception/ToStringCest.php
+++ b/tests/unit/Di/Exception/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Exception/WakeupCest.php b/tests/unit/Di/Exception/WakeupCest.php
index 4f82c51f49a..2896e51de22 100644
--- a/tests/unit/Di/Exception/WakeupCest.php
+++ b/tests/unit/Di/Exception/WakeupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Exception;
+namespace Phalcon\Tests\Unit\Di\Exception;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/AttemptCest.php b/tests/unit/Di/FactoryDefault/AttemptCest.php
index 81621fd215f..061dcad4d87 100644
--- a/tests/unit/Di/FactoryDefault/AttemptCest.php
+++ b/tests/unit/Di/FactoryDefault/AttemptCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/ConstructCest.php b/tests/unit/Di/FactoryDefault/ConstructCest.php
index 477bdfdacf9..e97e47ca041 100644
--- a/tests/unit/Di/FactoryDefault/ConstructCest.php
+++ b/tests/unit/Di/FactoryDefault/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use Codeception\Example;
 use Phalcon\Annotations\Adapter\Memory as MemoryAnnotations;
diff --git a/tests/unit/Di/FactoryDefault/GetCest.php b/tests/unit/Di/FactoryDefault/GetCest.php
index ae2f9631e71..b0a73a912db 100644
--- a/tests/unit/Di/FactoryDefault/GetCest.php
+++ b/tests/unit/Di/FactoryDefault/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/GetDefaultCest.php b/tests/unit/Di/FactoryDefault/GetDefaultCest.php
index 27251cedfe8..95465cf3256 100644
--- a/tests/unit/Di/FactoryDefault/GetDefaultCest.php
+++ b/tests/unit/Di/FactoryDefault/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/GetInternalEventsManagerCest.php b/tests/unit/Di/FactoryDefault/GetInternalEventsManagerCest.php
index 2eb3b8b9b90..886ff779460 100644
--- a/tests/unit/Di/FactoryDefault/GetInternalEventsManagerCest.php
+++ b/tests/unit/Di/FactoryDefault/GetInternalEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/GetRawCest.php b/tests/unit/Di/FactoryDefault/GetRawCest.php
index 2f0fccee59d..bf752c98ce3 100644
--- a/tests/unit/Di/FactoryDefault/GetRawCest.php
+++ b/tests/unit/Di/FactoryDefault/GetRawCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/GetServiceCest.php b/tests/unit/Di/FactoryDefault/GetServiceCest.php
index f09b9a76e06..e9f68afb841 100644
--- a/tests/unit/Di/FactoryDefault/GetServiceCest.php
+++ b/tests/unit/Di/FactoryDefault/GetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/GetServicesCest.php b/tests/unit/Di/FactoryDefault/GetServicesCest.php
index f77961f1815..67b42be82ae 100644
--- a/tests/unit/Di/FactoryDefault/GetServicesCest.php
+++ b/tests/unit/Di/FactoryDefault/GetServicesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/GetSharedCest.php b/tests/unit/Di/FactoryDefault/GetSharedCest.php
index b5ce3d8dfd7..4fc99ac15af 100644
--- a/tests/unit/Di/FactoryDefault/GetSharedCest.php
+++ b/tests/unit/Di/FactoryDefault/GetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/HasCest.php b/tests/unit/Di/FactoryDefault/HasCest.php
index bb4919d6cc1..654bcf224c2 100644
--- a/tests/unit/Di/FactoryDefault/HasCest.php
+++ b/tests/unit/Di/FactoryDefault/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/LoadFromPhpCest.php b/tests/unit/Di/FactoryDefault/LoadFromPhpCest.php
index 89cf939cb6c..c4e84a6e387 100644
--- a/tests/unit/Di/FactoryDefault/LoadFromPhpCest.php
+++ b/tests/unit/Di/FactoryDefault/LoadFromPhpCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/LoadFromYamlCest.php b/tests/unit/Di/FactoryDefault/LoadFromYamlCest.php
index 26e590c340e..0905fbc0f1b 100644
--- a/tests/unit/Di/FactoryDefault/LoadFromYamlCest.php
+++ b/tests/unit/Di/FactoryDefault/LoadFromYamlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/OffsetExistsCest.php b/tests/unit/Di/FactoryDefault/OffsetExistsCest.php
index f515be94cab..23103efb33b 100644
--- a/tests/unit/Di/FactoryDefault/OffsetExistsCest.php
+++ b/tests/unit/Di/FactoryDefault/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/OffsetGetCest.php b/tests/unit/Di/FactoryDefault/OffsetGetCest.php
index 9a96a1cae75..fc0f02a745e 100644
--- a/tests/unit/Di/FactoryDefault/OffsetGetCest.php
+++ b/tests/unit/Di/FactoryDefault/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/OffsetSetCest.php b/tests/unit/Di/FactoryDefault/OffsetSetCest.php
index 7b056e5ad31..36e5dbab52e 100644
--- a/tests/unit/Di/FactoryDefault/OffsetSetCest.php
+++ b/tests/unit/Di/FactoryDefault/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/OffsetUnsetCest.php b/tests/unit/Di/FactoryDefault/OffsetUnsetCest.php
index dc715ed8678..e4b3725fffc 100644
--- a/tests/unit/Di/FactoryDefault/OffsetUnsetCest.php
+++ b/tests/unit/Di/FactoryDefault/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/RegisterCest.php b/tests/unit/Di/FactoryDefault/RegisterCest.php
index 023c92e9d2b..2ea738759f8 100644
--- a/tests/unit/Di/FactoryDefault/RegisterCest.php
+++ b/tests/unit/Di/FactoryDefault/RegisterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/RemoveCest.php b/tests/unit/Di/FactoryDefault/RemoveCest.php
index 55dbaffca24..bebf45fc272 100644
--- a/tests/unit/Di/FactoryDefault/RemoveCest.php
+++ b/tests/unit/Di/FactoryDefault/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/ResetCest.php b/tests/unit/Di/FactoryDefault/ResetCest.php
index 57dd92b5ac9..f0807edae68 100644
--- a/tests/unit/Di/FactoryDefault/ResetCest.php
+++ b/tests/unit/Di/FactoryDefault/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/SetCest.php b/tests/unit/Di/FactoryDefault/SetCest.php
index 7914d7da6fe..480f08d0681 100644
--- a/tests/unit/Di/FactoryDefault/SetCest.php
+++ b/tests/unit/Di/FactoryDefault/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/SetDefaultCest.php b/tests/unit/Di/FactoryDefault/SetDefaultCest.php
index f7509901ce0..585d2497975 100644
--- a/tests/unit/Di/FactoryDefault/SetDefaultCest.php
+++ b/tests/unit/Di/FactoryDefault/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/SetInternalEventsManagerCest.php b/tests/unit/Di/FactoryDefault/SetInternalEventsManagerCest.php
index 4df6d2cf5fe..efb87f6becd 100644
--- a/tests/unit/Di/FactoryDefault/SetInternalEventsManagerCest.php
+++ b/tests/unit/Di/FactoryDefault/SetInternalEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/SetServiceCest.php b/tests/unit/Di/FactoryDefault/SetServiceCest.php
index 32d4c2870b2..77c170ffad9 100644
--- a/tests/unit/Di/FactoryDefault/SetServiceCest.php
+++ b/tests/unit/Di/FactoryDefault/SetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Di\Service;
diff --git a/tests/unit/Di/FactoryDefault/SetSharedCest.php b/tests/unit/Di/FactoryDefault/SetSharedCest.php
index 4ef03ac32ff..586586398c4 100644
--- a/tests/unit/Di/FactoryDefault/SetSharedCest.php
+++ b/tests/unit/Di/FactoryDefault/SetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/FactoryDefault/UnderscoreCallCest.php b/tests/unit/Di/FactoryDefault/UnderscoreCallCest.php
index 522438ef75e..aa970635ffe 100644
--- a/tests/unit/Di/FactoryDefault/UnderscoreCallCest.php
+++ b/tests/unit/Di/FactoryDefault/UnderscoreCallCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\FactoryDefault;
+namespace Phalcon\Tests\Unit\Di\FactoryDefault;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/GetCest.php b/tests/unit/Di/GetCest.php
index 84a7e9fc63d..e9a9abf16f8 100644
--- a/tests/unit/Di/GetCest.php
+++ b/tests/unit/Di/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Di\Exception;
diff --git a/tests/unit/Di/GetDICest.php b/tests/unit/Di/GetDICest.php
index 97e68a34869..890ac075ce8 100644
--- a/tests/unit/Di/GetDICest.php
+++ b/tests/unit/Di/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use InjectableComponent;
 use Phalcon\Di;
diff --git a/tests/unit/Di/GetDefaultCest.php b/tests/unit/Di/GetDefaultCest.php
index ce3e8c683aa..b6ebe5c5187 100644
--- a/tests/unit/Di/GetDefaultCest.php
+++ b/tests/unit/Di/GetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use UnitTester;
diff --git a/tests/unit/Di/GetInternalEventsManagerCest.php b/tests/unit/Di/GetInternalEventsManagerCest.php
index 37eefb5a4b6..8e921c5695f 100644
--- a/tests/unit/Di/GetInternalEventsManagerCest.php
+++ b/tests/unit/Di/GetInternalEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Events\Manager;
diff --git a/tests/unit/Di/GetRawCest.php b/tests/unit/Di/GetRawCest.php
index 59057a72710..c8672800f7a 100644
--- a/tests/unit/Di/GetRawCest.php
+++ b/tests/unit/Di/GetRawCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Exception;
 use Phalcon\Di;
diff --git a/tests/unit/Di/GetServiceCest.php b/tests/unit/Di/GetServiceCest.php
index a59d614e18c..ec833b0c997 100644
--- a/tests/unit/Di/GetServiceCest.php
+++ b/tests/unit/Di/GetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Di\Exception;
diff --git a/tests/unit/Di/GetServicesCest.php b/tests/unit/Di/GetServicesCest.php
index 1292d21aa3a..1c6ad895b6e 100644
--- a/tests/unit/Di/GetServicesCest.php
+++ b/tests/unit/Di/GetServicesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use UnitTester;
diff --git a/tests/unit/Di/GetSetDefaultCest.php b/tests/unit/Di/GetSetDefaultCest.php
index ace147936b6..5e94e6a12cf 100644
--- a/tests/unit/Di/GetSetDefaultCest.php
+++ b/tests/unit/Di/GetSetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Crypt;
 use Phalcon\Di;
diff --git a/tests/unit/Di/GetSharedCest.php b/tests/unit/Di/GetSharedCest.php
index 90a7f7c9f94..6177cdbdf23 100644
--- a/tests/unit/Di/GetSharedCest.php
+++ b/tests/unit/Di/GetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Crypt;
 use Phalcon\Di;
diff --git a/tests/unit/Di/HasCest.php b/tests/unit/Di/HasCest.php
index a67046384c8..1d90df1af87 100644
--- a/tests/unit/Di/HasCest.php
+++ b/tests/unit/Di/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Escaper;
diff --git a/tests/unit/Di/Injectable/GetDICest.php b/tests/unit/Di/Injectable/GetDICest.php
index d9a8806b2bd..871c7a9c530 100644
--- a/tests/unit/Di/Injectable/GetDICest.php
+++ b/tests/unit/Di/Injectable/GetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Injectable;
+namespace Phalcon\Tests\Unit\Di\Injectable;
 
 use InjectableComponent;
 use Phalcon\Di;
diff --git a/tests/unit/Di/Injectable/SetDICest.php b/tests/unit/Di/Injectable/SetDICest.php
index a0d5dcb84f2..11946d28f8f 100644
--- a/tests/unit/Di/Injectable/SetDICest.php
+++ b/tests/unit/Di/Injectable/SetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Injectable;
+namespace Phalcon\Tests\Unit\Di\Injectable;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Injectable/UnderscoreGetCest.php b/tests/unit/Di/Injectable/UnderscoreGetCest.php
index 59ef7146ed5..e7b1f172e7c 100644
--- a/tests/unit/Di/Injectable/UnderscoreGetCest.php
+++ b/tests/unit/Di/Injectable/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Injectable;
+namespace Phalcon\Tests\Unit\Di\Injectable;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/LoadFromPhpCest.php b/tests/unit/Di/LoadFromPhpCest.php
index 046286011f5..ada8d769f40 100644
--- a/tests/unit/Di/LoadFromPhpCest.php
+++ b/tests/unit/Di/LoadFromPhpCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Config;
 use Phalcon\Di;
diff --git a/tests/unit/Di/LoadFromYamlCest.php b/tests/unit/Di/LoadFromYamlCest.php
index b82f345c3b6..32f13978cfb 100644
--- a/tests/unit/Di/LoadFromYamlCest.php
+++ b/tests/unit/Di/LoadFromYamlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Config;
 use Phalcon\Di;
diff --git a/tests/unit/Di/OffsetExistsCest.php b/tests/unit/Di/OffsetExistsCest.php
index a1217e91bd3..facf6643790 100644
--- a/tests/unit/Di/OffsetExistsCest.php
+++ b/tests/unit/Di/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Escaper;
diff --git a/tests/unit/Di/OffsetGetCest.php b/tests/unit/Di/OffsetGetCest.php
index 79fe1445f04..29c24b69094 100644
--- a/tests/unit/Di/OffsetGetCest.php
+++ b/tests/unit/Di/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Di\Exception;
diff --git a/tests/unit/Di/OffsetSetCest.php b/tests/unit/Di/OffsetSetCest.php
index 1298e51843d..fac2a978f1e 100644
--- a/tests/unit/Di/OffsetSetCest.php
+++ b/tests/unit/Di/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Crypt;
 use Phalcon\Di;
diff --git a/tests/unit/Di/OffsetUnsetCest.php b/tests/unit/Di/OffsetUnsetCest.php
index 618893bc8fb..7e95c12f49a 100644
--- a/tests/unit/Di/OffsetUnsetCest.php
+++ b/tests/unit/Di/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Escaper;
diff --git a/tests/unit/Di/RegisterCest.php b/tests/unit/Di/RegisterCest.php
index 5a94f8747f0..f876864c0e4 100644
--- a/tests/unit/Di/RegisterCest.php
+++ b/tests/unit/Di/RegisterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use SomeComponent;
diff --git a/tests/unit/Di/RemoveCest.php b/tests/unit/Di/RemoveCest.php
index 534851ef8a6..8f72b3052b2 100644
--- a/tests/unit/Di/RemoveCest.php
+++ b/tests/unit/Di/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Escaper;
diff --git a/tests/unit/Di/ResetCest.php b/tests/unit/Di/ResetCest.php
index 97d2255be4e..1f6c2c519f1 100644
--- a/tests/unit/Di/ResetCest.php
+++ b/tests/unit/Di/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use UnitTester;
diff --git a/tests/unit/Di/Service/Builder/BuildCest.php b/tests/unit/Di/Service/Builder/BuildCest.php
index 269d7eac947..f9277f79f39 100644
--- a/tests/unit/Di/Service/Builder/BuildCest.php
+++ b/tests/unit/Di/Service/Builder/BuildCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service\Builder;
+namespace Phalcon\Tests\Unit\Di\Service\Builder;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/ConstructCest.php b/tests/unit/Di/Service/ConstructCest.php
index 8c78c0884ca..e68b1ccc77f 100644
--- a/tests/unit/Di/Service/ConstructCest.php
+++ b/tests/unit/Di/Service/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/GetDefinitionCest.php b/tests/unit/Di/Service/GetDefinitionCest.php
index c6c6a4276de..e4d985f1898 100644
--- a/tests/unit/Di/Service/GetDefinitionCest.php
+++ b/tests/unit/Di/Service/GetDefinitionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use Phalcon\Di\Service;
 use UnitTester;
diff --git a/tests/unit/Di/Service/GetNameCest.php b/tests/unit/Di/Service/GetNameCest.php
index 44e5506e023..db337a968d9 100644
--- a/tests/unit/Di/Service/GetNameCest.php
+++ b/tests/unit/Di/Service/GetNameCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/GetParameterCest.php b/tests/unit/Di/Service/GetParameterCest.php
index 5ed44d6ee27..4be1f4c5a68 100644
--- a/tests/unit/Di/Service/GetParameterCest.php
+++ b/tests/unit/Di/Service/GetParameterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/IsResolvedCest.php b/tests/unit/Di/Service/IsResolvedCest.php
index fc6decba831..c42d3e3f173 100644
--- a/tests/unit/Di/Service/IsResolvedCest.php
+++ b/tests/unit/Di/Service/IsResolvedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/IsSharedCest.php b/tests/unit/Di/Service/IsSharedCest.php
index 9fd7ee5120c..ca41df9390a 100644
--- a/tests/unit/Di/Service/IsSharedCest.php
+++ b/tests/unit/Di/Service/IsSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use Codeception\Example;
 use Phalcon\Di\Service;
diff --git a/tests/unit/Di/Service/ResolveCest.php b/tests/unit/Di/Service/ResolveCest.php
index d2420c479b8..90873da67e8 100644
--- a/tests/unit/Di/Service/ResolveCest.php
+++ b/tests/unit/Di/Service/ResolveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/SetDefinitionCest.php b/tests/unit/Di/Service/SetDefinitionCest.php
index 771bad019af..d016a00ffaf 100644
--- a/tests/unit/Di/Service/SetDefinitionCest.php
+++ b/tests/unit/Di/Service/SetDefinitionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/SetParameterCest.php b/tests/unit/Di/Service/SetParameterCest.php
index e4ac8c706c0..b22b730386e 100644
--- a/tests/unit/Di/Service/SetParameterCest.php
+++ b/tests/unit/Di/Service/SetParameterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/Service/SetSharedCest.php b/tests/unit/Di/Service/SetSharedCest.php
index 2d97d02629e..b01bd5abed4 100644
--- a/tests/unit/Di/Service/SetSharedCest.php
+++ b/tests/unit/Di/Service/SetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use Codeception\Example;
 use Phalcon\Di\Service;
diff --git a/tests/unit/Di/Service/SetSharedInstanceCest.php b/tests/unit/Di/Service/SetSharedInstanceCest.php
index 2c134b2e2ec..64a2ccb23cb 100644
--- a/tests/unit/Di/Service/SetSharedInstanceCest.php
+++ b/tests/unit/Di/Service/SetSharedInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di\Service;
+namespace Phalcon\Tests\Unit\Di\Service;
 
 use UnitTester;
 
diff --git a/tests/unit/Di/ServiceCest.php b/tests/unit/Di/ServiceCest.php
index 72f8853915b..2b260ae8069 100644
--- a/tests/unit/Di/ServiceCest.php
+++ b/tests/unit/Di/ServiceCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Escaper;
diff --git a/tests/unit/Di/SetCest.php b/tests/unit/Di/SetCest.php
index d5348405cbd..904365a6529 100644
--- a/tests/unit/Di/SetCest.php
+++ b/tests/unit/Di/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Crypt;
 use Phalcon\Di;
diff --git a/tests/unit/Di/SetDefaultCest.php b/tests/unit/Di/SetDefaultCest.php
index e6d4f2a456f..449121f31f2 100644
--- a/tests/unit/Di/SetDefaultCest.php
+++ b/tests/unit/Di/SetDefaultCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use UnitTester;
diff --git a/tests/unit/Di/SetInternalEventsManagerCest.php b/tests/unit/Di/SetInternalEventsManagerCest.php
index 75db0477954..5b71cff24fc 100644
--- a/tests/unit/Di/SetInternalEventsManagerCest.php
+++ b/tests/unit/Di/SetInternalEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Events\Manager;
diff --git a/tests/unit/Di/SetServiceCest.php b/tests/unit/Di/SetServiceCest.php
index b59412da147..98a33e5acb3 100644
--- a/tests/unit/Di/SetServiceCest.php
+++ b/tests/unit/Di/SetServiceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Di\Service;
diff --git a/tests/unit/Di/SetSharedCest.php b/tests/unit/Di/SetSharedCest.php
index dc41eb8c3d0..13f5b3a2294 100644
--- a/tests/unit/Di/SetSharedCest.php
+++ b/tests/unit/Di/SetSharedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Escaper;
diff --git a/tests/unit/Di/UnderscoreCallCest.php b/tests/unit/Di/UnderscoreCallCest.php
index d94336605d1..2670c8b9e01 100644
--- a/tests/unit/Di/UnderscoreCallCest.php
+++ b/tests/unit/Di/UnderscoreCallCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Di;
+namespace Phalcon\Tests\Unit\Di;
 
 use Phalcon\Di;
 use Phalcon\Di\Exception;
diff --git a/tests/unit/Dispatcher/GetActionSuffixCest.php b/tests/unit/Dispatcher/GetActionSuffixCest.php
index 68ff93572e2..befc439f8b6 100644
--- a/tests/unit/Dispatcher/GetActionSuffixCest.php
+++ b/tests/unit/Dispatcher/GetActionSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetActiveMethodCest.php b/tests/unit/Dispatcher/GetActiveMethodCest.php
index 20d3381c0aa..6597021a50f 100644
--- a/tests/unit/Dispatcher/GetActiveMethodCest.php
+++ b/tests/unit/Dispatcher/GetActiveMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use Codeception\Example;
 use Phalcon\Mvc\Dispatcher;
diff --git a/tests/unit/Dispatcher/GetBoundModelsCest.php b/tests/unit/Dispatcher/GetBoundModelsCest.php
index e045468264e..98460dee2b8 100644
--- a/tests/unit/Dispatcher/GetBoundModelsCest.php
+++ b/tests/unit/Dispatcher/GetBoundModelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetDefaultNamespaceCest.php b/tests/unit/Dispatcher/GetDefaultNamespaceCest.php
index 7e9592ceacc..54ee8f431c0 100644
--- a/tests/unit/Dispatcher/GetDefaultNamespaceCest.php
+++ b/tests/unit/Dispatcher/GetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetHandlerClassCest.php b/tests/unit/Dispatcher/GetHandlerClassCest.php
index 8668aab2a59..d2b517ca09c 100644
--- a/tests/unit/Dispatcher/GetHandlerClassCest.php
+++ b/tests/unit/Dispatcher/GetHandlerClassCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use Codeception\Example;
 use Phalcon\Mvc\Dispatcher;
diff --git a/tests/unit/Dispatcher/GetHandlerSuffixCest.php b/tests/unit/Dispatcher/GetHandlerSuffixCest.php
index c9a87a6f51a..eba025590f6 100644
--- a/tests/unit/Dispatcher/GetHandlerSuffixCest.php
+++ b/tests/unit/Dispatcher/GetHandlerSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetModelBinderCest.php b/tests/unit/Dispatcher/GetModelBinderCest.php
index 458e38eb4ea..5bfdefe5bf2 100644
--- a/tests/unit/Dispatcher/GetModelBinderCest.php
+++ b/tests/unit/Dispatcher/GetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetModuleNameCest.php b/tests/unit/Dispatcher/GetModuleNameCest.php
index 17ce4c31402..63384ac341a 100644
--- a/tests/unit/Dispatcher/GetModuleNameCest.php
+++ b/tests/unit/Dispatcher/GetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetNamespaceNameCest.php b/tests/unit/Dispatcher/GetNamespaceNameCest.php
index f0bbaebdaa6..3feadad1054 100644
--- a/tests/unit/Dispatcher/GetNamespaceNameCest.php
+++ b/tests/unit/Dispatcher/GetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetParamCest.php b/tests/unit/Dispatcher/GetParamCest.php
index af6b7644e1d..45050e2f05a 100644
--- a/tests/unit/Dispatcher/GetParamCest.php
+++ b/tests/unit/Dispatcher/GetParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetParamsCest.php b/tests/unit/Dispatcher/GetParamsCest.php
index c5cfde18d2b..d2982253e1a 100644
--- a/tests/unit/Dispatcher/GetParamsCest.php
+++ b/tests/unit/Dispatcher/GetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetReturnedValueCest.php b/tests/unit/Dispatcher/GetReturnedValueCest.php
index 75418f3ef69..860f6ed431b 100644
--- a/tests/unit/Dispatcher/GetReturnedValueCest.php
+++ b/tests/unit/Dispatcher/GetReturnedValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/GetSetDICest.php b/tests/unit/Dispatcher/GetSetDICest.php
index 14d31622f13..1a9f63546f0 100644
--- a/tests/unit/Dispatcher/GetSetDICest.php
+++ b/tests/unit/Dispatcher/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use Phalcon\Di;
 use Phalcon\Mvc\Dispatcher;
diff --git a/tests/unit/Dispatcher/GetSetEventsManagerCest.php b/tests/unit/Dispatcher/GetSetEventsManagerCest.php
index a0e6c1d4077..5ef510a7517 100644
--- a/tests/unit/Dispatcher/GetSetEventsManagerCest.php
+++ b/tests/unit/Dispatcher/GetSetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use Phalcon\Events\Manager;
 use Phalcon\Mvc\Dispatcher;
diff --git a/tests/unit/Dispatcher/HasParamCest.php b/tests/unit/Dispatcher/HasParamCest.php
index 17932ddeeeb..768c42c1880 100644
--- a/tests/unit/Dispatcher/HasParamCest.php
+++ b/tests/unit/Dispatcher/HasParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/IsFinishedCest.php b/tests/unit/Dispatcher/IsFinishedCest.php
index 16e14846382..380100d654e 100644
--- a/tests/unit/Dispatcher/IsFinishedCest.php
+++ b/tests/unit/Dispatcher/IsFinishedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetActionNameCest.php b/tests/unit/Dispatcher/SetActionNameCest.php
index 1d27a2a71f9..93c0c1d4ddf 100644
--- a/tests/unit/Dispatcher/SetActionNameCest.php
+++ b/tests/unit/Dispatcher/SetActionNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetActionSuffixCest.php b/tests/unit/Dispatcher/SetActionSuffixCest.php
index 132bf1dd105..26b70e7ab1b 100644
--- a/tests/unit/Dispatcher/SetActionSuffixCest.php
+++ b/tests/unit/Dispatcher/SetActionSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetDefaultActionCest.php b/tests/unit/Dispatcher/SetDefaultActionCest.php
index 164e662b569..da90efadfb7 100644
--- a/tests/unit/Dispatcher/SetDefaultActionCest.php
+++ b/tests/unit/Dispatcher/SetDefaultActionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetDefaultNamespaceCest.php b/tests/unit/Dispatcher/SetDefaultNamespaceCest.php
index ba00302fc86..3106bedb061 100644
--- a/tests/unit/Dispatcher/SetDefaultNamespaceCest.php
+++ b/tests/unit/Dispatcher/SetDefaultNamespaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetHandlerSuffixCest.php b/tests/unit/Dispatcher/SetHandlerSuffixCest.php
index 3e5d950e6fc..e7787b7860f 100644
--- a/tests/unit/Dispatcher/SetHandlerSuffixCest.php
+++ b/tests/unit/Dispatcher/SetHandlerSuffixCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetModelBinderCest.php b/tests/unit/Dispatcher/SetModelBinderCest.php
index 6fd0d2df347..09325a58042 100644
--- a/tests/unit/Dispatcher/SetModelBinderCest.php
+++ b/tests/unit/Dispatcher/SetModelBinderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetModuleNameCest.php b/tests/unit/Dispatcher/SetModuleNameCest.php
index b001fa038f8..d769016b59e 100644
--- a/tests/unit/Dispatcher/SetModuleNameCest.php
+++ b/tests/unit/Dispatcher/SetModuleNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetNamespaceNameCest.php b/tests/unit/Dispatcher/SetNamespaceNameCest.php
index 1c9bc675f89..1396c4f498c 100644
--- a/tests/unit/Dispatcher/SetNamespaceNameCest.php
+++ b/tests/unit/Dispatcher/SetNamespaceNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetParamCest.php b/tests/unit/Dispatcher/SetParamCest.php
index bea5d6e3f04..d43e50b8134 100644
--- a/tests/unit/Dispatcher/SetParamCest.php
+++ b/tests/unit/Dispatcher/SetParamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetParamsCest.php b/tests/unit/Dispatcher/SetParamsCest.php
index ea02cc69ccb..33724f39500 100644
--- a/tests/unit/Dispatcher/SetParamsCest.php
+++ b/tests/unit/Dispatcher/SetParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/SetReturnedValueCest.php b/tests/unit/Dispatcher/SetReturnedValueCest.php
index b41e1e88955..8b98e69d343 100644
--- a/tests/unit/Dispatcher/SetReturnedValueCest.php
+++ b/tests/unit/Dispatcher/SetReturnedValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Dispatcher/WasForwardedCest.php b/tests/unit/Dispatcher/WasForwardedCest.php
index 1d74748a8cf..ed6dee258e6 100644
--- a/tests/unit/Dispatcher/WasForwardedCest.php
+++ b/tests/unit/Dispatcher/WasForwardedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Dispatcher;
+namespace Phalcon\Tests\Unit\Dispatcher;
 
 use UnitTester;
 
diff --git a/tests/unit/Domain/Payload/Payload/GetSetExceptionCest.php b/tests/unit/Domain/Payload/Payload/GetSetExceptionCest.php
index aaeee60e2e4..8cca6e21124 100644
--- a/tests/unit/Domain/Payload/Payload/GetSetExceptionCest.php
+++ b/tests/unit/Domain/Payload/Payload/GetSetExceptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Payload;
 use RuntimeException;
diff --git a/tests/unit/Domain/Payload/Payload/GetSetExtrasCest.php b/tests/unit/Domain/Payload/Payload/GetSetExtrasCest.php
index 27f5468652e..da61a875413 100644
--- a/tests/unit/Domain/Payload/Payload/GetSetExtrasCest.php
+++ b/tests/unit/Domain/Payload/Payload/GetSetExtrasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Payload;
 use UnitTester;
diff --git a/tests/unit/Domain/Payload/Payload/GetSetInputCest.php b/tests/unit/Domain/Payload/Payload/GetSetInputCest.php
index f82ab66a709..fe691126787 100644
--- a/tests/unit/Domain/Payload/Payload/GetSetInputCest.php
+++ b/tests/unit/Domain/Payload/Payload/GetSetInputCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Payload;
 use UnitTester;
diff --git a/tests/unit/Domain/Payload/Payload/GetSetMessagesCest.php b/tests/unit/Domain/Payload/Payload/GetSetMessagesCest.php
index cb1ea05cea2..29dd3faef12 100644
--- a/tests/unit/Domain/Payload/Payload/GetSetMessagesCest.php
+++ b/tests/unit/Domain/Payload/Payload/GetSetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Payload;
 use UnitTester;
diff --git a/tests/unit/Domain/Payload/Payload/GetSetOutputCest.php b/tests/unit/Domain/Payload/Payload/GetSetOutputCest.php
index 87c0a6fc230..af7e1df0148 100644
--- a/tests/unit/Domain/Payload/Payload/GetSetOutputCest.php
+++ b/tests/unit/Domain/Payload/Payload/GetSetOutputCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Payload;
 use UnitTester;
diff --git a/tests/unit/Domain/Payload/Payload/GetSetStatusCest.php b/tests/unit/Domain/Payload/Payload/GetSetStatusCest.php
index 5cb17910462..cead6739ff4 100644
--- a/tests/unit/Domain/Payload/Payload/GetSetStatusCest.php
+++ b/tests/unit/Domain/Payload/Payload/GetSetStatusCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Payload;
 use Phalcon\Domain\Payload\Status;
diff --git a/tests/unit/Domain/Payload/Payload/StatusCest.php b/tests/unit/Domain/Payload/Payload/StatusCest.php
index ed202635bfc..26b96d49fdd 100644
--- a/tests/unit/Domain/Payload/Payload/StatusCest.php
+++ b/tests/unit/Domain/Payload/Payload/StatusCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\Payload;
+namespace Phalcon\Tests\Unit\Domain\Payload\Payload;
 
 use Phalcon\Domain\Payload\Status;
 use UnitTester;
diff --git a/tests/unit/Domain/Payload/PayloadFactory/NewInstanceCest.php b/tests/unit/Domain/Payload/PayloadFactory/NewInstanceCest.php
index 17c8b61186f..6e88e560c72 100644
--- a/tests/unit/Domain/Payload/PayloadFactory/NewInstanceCest.php
+++ b/tests/unit/Domain/Payload/PayloadFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Domain\Payload\PayloadFactory;
+namespace Phalcon\Tests\Unit\Domain\Payload\PayloadFactory;
 
 use Phalcon\Domain\Payload\PayloadFactory;
 use Phalcon\Domain\Payload\PayloadInterface;
diff --git a/tests/unit/Escaper/DetectEncodingCest.php b/tests/unit/Escaper/DetectEncodingCest.php
index cca3049a949..d19f7473fd6 100644
--- a/tests/unit/Escaper/DetectEncodingCest.php
+++ b/tests/unit/Escaper/DetectEncodingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Escaper/EscapeCssCest.php b/tests/unit/Escaper/EscapeCssCest.php
index 5489d7082e7..e72b7af7b8b 100644
--- a/tests/unit/Escaper/EscapeCssCest.php
+++ b/tests/unit/Escaper/EscapeCssCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/EscapeHtmlAttrCest.php b/tests/unit/Escaper/EscapeHtmlAttrCest.php
index 7ae0a850040..aad05173c83 100644
--- a/tests/unit/Escaper/EscapeHtmlAttrCest.php
+++ b/tests/unit/Escaper/EscapeHtmlAttrCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Escaper/EscapeHtmlCest.php b/tests/unit/Escaper/EscapeHtmlCest.php
index bf8aaeb1de5..1d0606a483b 100644
--- a/tests/unit/Escaper/EscapeHtmlCest.php
+++ b/tests/unit/Escaper/EscapeHtmlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/EscapeJsCest.php b/tests/unit/Escaper/EscapeJsCest.php
index 976ce5597b1..a7e3e8cae6e 100644
--- a/tests/unit/Escaper/EscapeJsCest.php
+++ b/tests/unit/Escaper/EscapeJsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/EscapeUrlCest.php b/tests/unit/Escaper/EscapeUrlCest.php
index 3039eba65e3..42a96d3b93f 100644
--- a/tests/unit/Escaper/EscapeUrlCest.php
+++ b/tests/unit/Escaper/EscapeUrlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/GetSetEncodingCest.php b/tests/unit/Escaper/GetSetEncodingCest.php
index 7bb5ec691b1..08fb62f7867 100644
--- a/tests/unit/Escaper/GetSetEncodingCest.php
+++ b/tests/unit/Escaper/GetSetEncodingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/NormalizeEncodingCest.php b/tests/unit/Escaper/NormalizeEncodingCest.php
index d9105a38c0d..e453c54b7a7 100644
--- a/tests/unit/Escaper/NormalizeEncodingCest.php
+++ b/tests/unit/Escaper/NormalizeEncodingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/SetDoubleEncodeCest.php b/tests/unit/Escaper/SetDoubleEncodeCest.php
index c2bf924bb93..4c22fae3193 100644
--- a/tests/unit/Escaper/SetDoubleEncodeCest.php
+++ b/tests/unit/Escaper/SetDoubleEncodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Escaper/SetHtmlQuoteTypeCest.php b/tests/unit/Escaper/SetHtmlQuoteTypeCest.php
index 385c516d9d4..5d1a7126437 100644
--- a/tests/unit/Escaper/SetHtmlQuoteTypeCest.php
+++ b/tests/unit/Escaper/SetHtmlQuoteTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Escaper;
+namespace Phalcon\Tests\Unit\Escaper;
 
 use Phalcon\Escaper;
 use UnitTester;
diff --git a/tests/unit/Events/Event/ConstructCest.php b/tests/unit/Events/Event/ConstructCest.php
index 856075a3224..f2506b8f1f3 100644
--- a/tests/unit/Events/Event/ConstructCest.php
+++ b/tests/unit/Events/Event/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Event/GetSetDataCest.php b/tests/unit/Events/Event/GetSetDataCest.php
index c5126d09035..2e49a5aae5a 100644
--- a/tests/unit/Events/Event/GetSetDataCest.php
+++ b/tests/unit/Events/Event/GetSetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use UnitTester;
diff --git a/tests/unit/Events/Event/GetSourceCest.php b/tests/unit/Events/Event/GetSourceCest.php
index 26d71c450a0..208207a78c0 100644
--- a/tests/unit/Events/Event/GetSourceCest.php
+++ b/tests/unit/Events/Event/GetSourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use UnitTester;
diff --git a/tests/unit/Events/Event/GetTypeCest.php b/tests/unit/Events/Event/GetTypeCest.php
index b27a981bffc..9f2d5d092ed 100644
--- a/tests/unit/Events/Event/GetTypeCest.php
+++ b/tests/unit/Events/Event/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use UnitTester;
diff --git a/tests/unit/Events/Event/IsCancelableCest.php b/tests/unit/Events/Event/IsCancelableCest.php
index 8dab503d4f3..467249bdf1d 100644
--- a/tests/unit/Events/Event/IsCancelableCest.php
+++ b/tests/unit/Events/Event/IsCancelableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use UnitTester;
diff --git a/tests/unit/Events/Event/IsStoppedCest.php b/tests/unit/Events/Event/IsStoppedCest.php
index c69aac3e976..69539d37540 100644
--- a/tests/unit/Events/Event/IsStoppedCest.php
+++ b/tests/unit/Events/Event/IsStoppedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use UnitTester;
diff --git a/tests/unit/Events/Event/SetTypeCest.php b/tests/unit/Events/Event/SetTypeCest.php
index 66496fd6514..612ef9f2d6a 100644
--- a/tests/unit/Events/Event/SetTypeCest.php
+++ b/tests/unit/Events/Event/SetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use UnitTester;
diff --git a/tests/unit/Events/Event/StopCest.php b/tests/unit/Events/Event/StopCest.php
index 8ec1bb9a79b..aa01091727d 100644
--- a/tests/unit/Events/Event/StopCest.php
+++ b/tests/unit/Events/Event/StopCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Event;
+namespace Phalcon\Tests\Unit\Events\Event;
 
 use Phalcon\Events\Event;
 use Phalcon\Events\Manager;
diff --git a/tests/unit/Events/Manager/ArePrioritiesEnabledCest.php b/tests/unit/Events/Manager/ArePrioritiesEnabledCest.php
index 846d4df747c..e25b26ec419 100644
--- a/tests/unit/Events/Manager/ArePrioritiesEnabledCest.php
+++ b/tests/unit/Events/Manager/ArePrioritiesEnabledCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use Phalcon\Events\Manager;
 use UnitTester;
diff --git a/tests/unit/Events/Manager/AttachCest.php b/tests/unit/Events/Manager/AttachCest.php
index 6c832ece486..8e40362ad48 100644
--- a/tests/unit/Events/Manager/AttachCest.php
+++ b/tests/unit/Events/Manager/AttachCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/CollectResponsesCest.php b/tests/unit/Events/Manager/CollectResponsesCest.php
index 8e836ed49cf..51428fa07a7 100644
--- a/tests/unit/Events/Manager/CollectResponsesCest.php
+++ b/tests/unit/Events/Manager/CollectResponsesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/DetachAllCest.php b/tests/unit/Events/Manager/DetachAllCest.php
index e2d1d7858ac..60753f544e0 100644
--- a/tests/unit/Events/Manager/DetachAllCest.php
+++ b/tests/unit/Events/Manager/DetachAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/DetachCest.php b/tests/unit/Events/Manager/DetachCest.php
index d5246babe0f..9a1a48fc186 100644
--- a/tests/unit/Events/Manager/DetachCest.php
+++ b/tests/unit/Events/Manager/DetachCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use Codeception\Example;
 use Phalcon\Events\Manager;
diff --git a/tests/unit/Events/Manager/EnablePrioritiesCest.php b/tests/unit/Events/Manager/EnablePrioritiesCest.php
index c1604f0403f..7b7a8f22d2f 100644
--- a/tests/unit/Events/Manager/EnablePrioritiesCest.php
+++ b/tests/unit/Events/Manager/EnablePrioritiesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/FireCest.php b/tests/unit/Events/Manager/FireCest.php
index 2fcceacb2c5..20b22e69523 100644
--- a/tests/unit/Events/Manager/FireCest.php
+++ b/tests/unit/Events/Manager/FireCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/FireQueueCest.php b/tests/unit/Events/Manager/FireQueueCest.php
index 605560aabf6..409d200bf1f 100644
--- a/tests/unit/Events/Manager/FireQueueCest.php
+++ b/tests/unit/Events/Manager/FireQueueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/GetListenersCest.php b/tests/unit/Events/Manager/GetListenersCest.php
index 2f874e7f5f3..15e84032ebe 100644
--- a/tests/unit/Events/Manager/GetListenersCest.php
+++ b/tests/unit/Events/Manager/GetListenersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/GetResponsesCest.php b/tests/unit/Events/Manager/GetResponsesCest.php
index 3f75b40a466..4ac74ed3566 100644
--- a/tests/unit/Events/Manager/GetResponsesCest.php
+++ b/tests/unit/Events/Manager/GetResponsesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/HasListenersCest.php b/tests/unit/Events/Manager/HasListenersCest.php
index 5389b3ca258..6fad83e153b 100644
--- a/tests/unit/Events/Manager/HasListenersCest.php
+++ b/tests/unit/Events/Manager/HasListenersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use UnitTester;
 
diff --git a/tests/unit/Events/Manager/IsCollectingCest.php b/tests/unit/Events/Manager/IsCollectingCest.php
index 8f3675fedd3..a82b72b71dc 100644
--- a/tests/unit/Events/Manager/IsCollectingCest.php
+++ b/tests/unit/Events/Manager/IsCollectingCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use Phalcon\Events\Manager;
 use UnitTester;
diff --git a/tests/unit/Events/Manager/IsValidHandlerCest.php b/tests/unit/Events/Manager/IsValidHandlerCest.php
index 64c60c7afcd..1fbc5e59890 100644
--- a/tests/unit/Events/Manager/IsValidHandlerCest.php
+++ b/tests/unit/Events/Manager/IsValidHandlerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Events\Manager;
+namespace Phalcon\Tests\Unit\Events\Manager;
 
 use Phalcon\Events\Manager;
 use UnitTester;
diff --git a/tests/unit/Events/ManagerCest.php b/tests/unit/Events/ManagerCest.php
index ba1142203e9..d5cc077b012 100644
--- a/tests/unit/Events/ManagerCest.php
+++ b/tests/unit/Events/ManagerCest.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Events;
+namespace Phalcon\Tests\Unit\Events;
 
 use Codeception\Example;
 use Phalcon\Events\Manager;
-use Phalcon\Test\Fixtures\Events\ComponentX;
-use Phalcon\Test\Fixtures\Events\ComponentY;
-use Phalcon\Test\Fixtures\Listener\FirstListener;
-use Phalcon\Test\Fixtures\Listener\SecondListener;
-use Phalcon\Test\Fixtures\Listener\ThirdListener;
+use Phalcon\Tests\Fixtures\Events\ComponentX;
+use Phalcon\Tests\Fixtures\Events\ComponentY;
+use Phalcon\Tests\Fixtures\Listener\FirstListener;
+use Phalcon\Tests\Fixtures\Listener\SecondListener;
+use Phalcon\Tests\Fixtures\Listener\ThirdListener;
 use UnitTester;
 
 class ManagerCest
diff --git a/tests/unit/Filter/Filter/ConstructCest.php b/tests/unit/Filter/Filter/ConstructCest.php
index 7b9bae49940..2bb3661e9bc 100644
--- a/tests/unit/Filter/Filter/ConstructCest.php
+++ b/tests/unit/Filter/Filter/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Filter;
+namespace Phalcon\Tests\Unit\Filter\Filter;
 
 use Phalcon\Filter;
 use Phalcon\Filter\Exception;
diff --git a/tests/unit/Filter/Filter/CustomCest.php b/tests/unit/Filter/Filter/CustomCest.php
index a7f63f92935..ee36cdf3284 100644
--- a/tests/unit/Filter/Filter/CustomCest.php
+++ b/tests/unit/Filter/Filter/CustomCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Filter;
+namespace Phalcon\Tests\Unit\Filter\Filter;
 
 use Phalcon\Filter;
-use Phalcon\Test\Fixtures\Filter\Sanitize\IPv4;
+use Phalcon\Tests\Fixtures\Filter\Sanitize\IPv4;
 use UnitTester;
 
 class CustomCest
diff --git a/tests/unit/Filter/Filter/GetSetHasCest.php b/tests/unit/Filter/Filter/GetSetHasCest.php
index eaea039b303..59ba6cfdf3f 100644
--- a/tests/unit/Filter/Filter/GetSetHasCest.php
+++ b/tests/unit/Filter/Filter/GetSetHasCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Filter;
+namespace Phalcon\Tests\Unit\Filter\Filter;
 
 use Closure;
 use Phalcon\Filter;
-use Phalcon\Test\Fixtures\Service\HelloService;
+use Phalcon\Tests\Fixtures\Service\HelloService;
 use UnitTester;
 
 class GetSetHasCest
diff --git a/tests/unit/Filter/Filter/SanitizeMultipleCest.php b/tests/unit/Filter/Filter/SanitizeMultipleCest.php
index f12688a2bb3..c6d13053a91 100644
--- a/tests/unit/Filter/Filter/SanitizeMultipleCest.php
+++ b/tests/unit/Filter/Filter/SanitizeMultipleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Filter;
+namespace Phalcon\Tests\Unit\Filter\Filter;
 
 use Phalcon\Filter\FilterFactory;
 use UnitTester;
diff --git a/tests/unit/Filter/FilterFactory/NewInstanceCest.php b/tests/unit/Filter/FilterFactory/NewInstanceCest.php
index 62a4b1a8199..4beba334a7d 100644
--- a/tests/unit/Filter/FilterFactory/NewInstanceCest.php
+++ b/tests/unit/Filter/FilterFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\FilterFactory;
+namespace Phalcon\Tests\Unit\Filter\FilterFactory;
 
 use Codeception\Example;
 use Phalcon\Filter;
diff --git a/tests/unit/Filter/Sanitize/AbsIntCest.php b/tests/unit/Filter/Sanitize/AbsIntCest.php
index 9f77c3eb70c..4f4edd538e6 100644
--- a/tests/unit/Filter/Sanitize/AbsIntCest.php
+++ b/tests/unit/Filter/Sanitize/AbsIntCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\AbsInt;
diff --git a/tests/unit/Filter/Sanitize/AlnumCest.php b/tests/unit/Filter/Sanitize/AlnumCest.php
index 8ee78aff6de..116304688ea 100644
--- a/tests/unit/Filter/Sanitize/AlnumCest.php
+++ b/tests/unit/Filter/Sanitize/AlnumCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Alnum;
diff --git a/tests/unit/Filter/Sanitize/AlphaCest.php b/tests/unit/Filter/Sanitize/AlphaCest.php
index 0d54f23287c..795192cd0d4 100644
--- a/tests/unit/Filter/Sanitize/AlphaCest.php
+++ b/tests/unit/Filter/Sanitize/AlphaCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Alpha;
diff --git a/tests/unit/Filter/Sanitize/BoolValCest.php b/tests/unit/Filter/Sanitize/BoolValCest.php
index 55ac5c84dc5..47ecbe6153f 100644
--- a/tests/unit/Filter/Sanitize/BoolValCest.php
+++ b/tests/unit/Filter/Sanitize/BoolValCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\BoolVal;
diff --git a/tests/unit/Filter/Sanitize/EmailCest.php b/tests/unit/Filter/Sanitize/EmailCest.php
index b614df70fb1..1df34c9d525 100644
--- a/tests/unit/Filter/Sanitize/EmailCest.php
+++ b/tests/unit/Filter/Sanitize/EmailCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Email;
diff --git a/tests/unit/Filter/Sanitize/FloatValCest.php b/tests/unit/Filter/Sanitize/FloatValCest.php
index 17d3f9931d3..be696a29381 100644
--- a/tests/unit/Filter/Sanitize/FloatValCest.php
+++ b/tests/unit/Filter/Sanitize/FloatValCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\FloatVal;
diff --git a/tests/unit/Filter/Sanitize/IntValCest.php b/tests/unit/Filter/Sanitize/IntValCest.php
index d423edc0b77..a6caa07b2fe 100644
--- a/tests/unit/Filter/Sanitize/IntValCest.php
+++ b/tests/unit/Filter/Sanitize/IntValCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\IntVal;
diff --git a/tests/unit/Filter/Sanitize/LowerCest.php b/tests/unit/Filter/Sanitize/LowerCest.php
index 86b2f929a8e..0f8346cce70 100644
--- a/tests/unit/Filter/Sanitize/LowerCest.php
+++ b/tests/unit/Filter/Sanitize/LowerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Lower;
diff --git a/tests/unit/Filter/Sanitize/LowerFirstCest.php b/tests/unit/Filter/Sanitize/LowerFirstCest.php
index b265f42ec2b..f4a01f663b0 100644
--- a/tests/unit/Filter/Sanitize/LowerFirstCest.php
+++ b/tests/unit/Filter/Sanitize/LowerFirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\LowerFirst;
diff --git a/tests/unit/Filter/Sanitize/RegexCest.php b/tests/unit/Filter/Sanitize/RegexCest.php
index 510a8411473..f432f671931 100644
--- a/tests/unit/Filter/Sanitize/RegexCest.php
+++ b/tests/unit/Filter/Sanitize/RegexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Regex;
diff --git a/tests/unit/Filter/Sanitize/RemoveCest.php b/tests/unit/Filter/Sanitize/RemoveCest.php
index df85d0a0691..7a02793fd6d 100644
--- a/tests/unit/Filter/Sanitize/RemoveCest.php
+++ b/tests/unit/Filter/Sanitize/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Remove;
diff --git a/tests/unit/Filter/Sanitize/ReplaceCest.php b/tests/unit/Filter/Sanitize/ReplaceCest.php
index 175302761bb..8807af8ed05 100644
--- a/tests/unit/Filter/Sanitize/ReplaceCest.php
+++ b/tests/unit/Filter/Sanitize/ReplaceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Replace;
diff --git a/tests/unit/Filter/Sanitize/SpecialCest.php b/tests/unit/Filter/Sanitize/SpecialCest.php
index 1cd26e91d89..087a0b9bcb0 100644
--- a/tests/unit/Filter/Sanitize/SpecialCest.php
+++ b/tests/unit/Filter/Sanitize/SpecialCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Special;
diff --git a/tests/unit/Filter/Sanitize/SpecialFullCest.php b/tests/unit/Filter/Sanitize/SpecialFullCest.php
index 46fa5c32472..89de920928a 100644
--- a/tests/unit/Filter/Sanitize/SpecialFullCest.php
+++ b/tests/unit/Filter/Sanitize/SpecialFullCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\SpecialFull;
diff --git a/tests/unit/Filter/Sanitize/StringValCest.php b/tests/unit/Filter/Sanitize/StringValCest.php
index 07175249a58..15f6e7850c8 100644
--- a/tests/unit/Filter/Sanitize/StringValCest.php
+++ b/tests/unit/Filter/Sanitize/StringValCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\StringVal;
diff --git a/tests/unit/Filter/Sanitize/StriptagsCest.php b/tests/unit/Filter/Sanitize/StriptagsCest.php
index 642c3d04224..32bc960a283 100644
--- a/tests/unit/Filter/Sanitize/StriptagsCest.php
+++ b/tests/unit/Filter/Sanitize/StriptagsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Striptags;
diff --git a/tests/unit/Filter/Sanitize/TrimCest.php b/tests/unit/Filter/Sanitize/TrimCest.php
index 74daac789e7..e2354bd3a7a 100644
--- a/tests/unit/Filter/Sanitize/TrimCest.php
+++ b/tests/unit/Filter/Sanitize/TrimCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Trim;
diff --git a/tests/unit/Filter/Sanitize/UpperCest.php b/tests/unit/Filter/Sanitize/UpperCest.php
index 61370972d90..b8135a49b48 100644
--- a/tests/unit/Filter/Sanitize/UpperCest.php
+++ b/tests/unit/Filter/Sanitize/UpperCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Upper;
diff --git a/tests/unit/Filter/Sanitize/UpperFirstCest.php b/tests/unit/Filter/Sanitize/UpperFirstCest.php
index 02a228660a2..ec77e8a1a9c 100644
--- a/tests/unit/Filter/Sanitize/UpperFirstCest.php
+++ b/tests/unit/Filter/Sanitize/UpperFirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\UpperFirst;
diff --git a/tests/unit/Filter/Sanitize/UpperWordsCest.php b/tests/unit/Filter/Sanitize/UpperWordsCest.php
index 593e5751c57..f4bcc8cae76 100644
--- a/tests/unit/Filter/Sanitize/UpperWordsCest.php
+++ b/tests/unit/Filter/Sanitize/UpperWordsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\UpperWords;
diff --git a/tests/unit/Filter/Sanitize/UrlCest.php b/tests/unit/Filter/Sanitize/UrlCest.php
index ea71f091274..42fafc8039e 100644
--- a/tests/unit/Filter/Sanitize/UrlCest.php
+++ b/tests/unit/Filter/Sanitize/UrlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Filter\Sanitize;
+namespace Phalcon\Tests\Unit\Filter\Sanitize;
 
 use Codeception\Example;
 use Phalcon\Filter\Sanitize\Url;
diff --git a/tests/unit/Flash/Direct/ConstructCest.php b/tests/unit/Flash/Direct/ConstructCest.php
index 85749beea72..256b15bb1fc 100644
--- a/tests/unit/Flash/Direct/ConstructCest.php
+++ b/tests/unit/Flash/Direct/ConstructCest.php
@@ -11,22 +11,32 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Direct;
+namespace Phalcon\Tests\Unit\Flash\Direct;
 
+use Phalcon\Flash\Direct;
+use Phalcon\Flash\FlashInterface;
 use UnitTester;
 
+/**
+ * Class ConstructCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
 class ConstructCest
 {
     /**
      * Tests Phalcon\Flash\Direct :: __construct()
      *
+     * @param UnitTester $I
+     *
      * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @since  2020-09-09
      */
     public function flashDirectConstruct(UnitTester $I)
     {
         $I->wantToTest('Flash\Direct - __construct()');
 
-        $I->skipTest('Need implementation');
+        $flash = new Direct();
+        $I->assertInstanceOf(FlashInterface::class, $flash);
     }
 }
diff --git a/tests/unit/Flash/Direct/FlashDirectCustomCSSCest.php b/tests/unit/Flash/Direct/FlashDirectCustomCSSCest.php
deleted file mode 100644
index bc618d0c906..00000000000
--- a/tests/unit/Flash/Direct/FlashDirectCustomCSSCest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use Phalcon\Test\Unit\Flash\Direct\Helper\FlashBase;
-use UnitTester;
-
-class FlashDirectCustomCSSCest extends FlashBase
-{
-    /**
-     * Executed before each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _before(UnitTester $I): void
-    {
-        parent::_before($I);
-
-        $this->setClasses([
-            'error'   => 'alert alert-error',
-            'success' => 'alert alert-success',
-            'notice'  => 'alert alert-notice',
-            'warning' => 'alert alert-warning',
-        ]);
-    }
-}
diff --git a/tests/unit/Flash/Direct/FlashDirectEmptyCSSCest.php b/tests/unit/Flash/Direct/FlashDirectEmptyCSSCest.php
deleted file mode 100644
index 785cbab14c5..00000000000
--- a/tests/unit/Flash/Direct/FlashDirectEmptyCSSCest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use Phalcon\Test\Unit\Flash\Direct\Helper\FlashBase;
-use UnitTester;
-
-class FlashDirectEmptyCSSCest extends FlashBase
-{
-    /**
-     * Executed before each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _before(UnitTester $I): void
-    {
-        parent::_before($I);
-
-        $this->setClasses([]);
-    }
-}
diff --git a/tests/unit/Flash/Direct/GetAutoescapeCest.php b/tests/unit/Flash/Direct/GetAutoescapeCest.php
deleted file mode 100644
index c3b695ffe14..00000000000
--- a/tests/unit/Flash/Direct/GetAutoescapeCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class GetAutoescapeCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: getAutoescape()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectGetAutoescape(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - getAutoescape()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/GetCustomTemplateCest.php b/tests/unit/Flash/Direct/GetCustomTemplateCest.php
deleted file mode 100644
index 3b804764f1e..00000000000
--- a/tests/unit/Flash/Direct/GetCustomTemplateCest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class GetCustomTemplateCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: getCustomTemplate()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectGetCustomTemplate(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - getCustomTemplate()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/GetEscaperServiceCest.php b/tests/unit/Flash/Direct/GetEscaperServiceCest.php
deleted file mode 100644
index b4b4d7be053..00000000000
--- a/tests/unit/Flash/Direct/GetEscaperServiceCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class GetEscaperServiceCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: getEscaperService()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectGetEscaperService(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - getEscaperService()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/GetSetAutoescapeCest.php b/tests/unit/Flash/Direct/GetSetAutoescapeCest.php
new file mode 100644
index 00000000000..8ff7b81a10f
--- /dev/null
+++ b/tests/unit/Flash/Direct/GetSetAutoescapeCest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Direct;
+
+use Phalcon\Flash\Direct;
+use UnitTester;
+
+/**
+ * Class GetAutoescapeCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
+class GetSetAutoescapeCest
+{
+    /**
+     * Tests Phalcon\Flash\Direct :: getAutoescape()/setAutoescape()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetSetAutoescape(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getAutoescape()/setAutoescape()');
+
+        $flash = new Direct();
+
+        $actual = $flash->getAutoescape();
+        $I->assertTrue($actual);
+
+        $actual = $flash->setAutoescape(false);
+        $I->assertInstanceOf(Direct::class, $actual);
+
+        $actual = $flash->getAutoescape();
+        $I->assertFalse($actual);
+    }
+}
diff --git a/tests/unit/Flash/Direct/GetSetCssClassesCest.php b/tests/unit/Flash/Direct/GetSetCssClassesCest.php
new file mode 100644
index 00000000000..b97347303dd
--- /dev/null
+++ b/tests/unit/Flash/Direct/GetSetCssClassesCest.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Direct;
+
+use Phalcon\Flash\Direct;
+use UnitTester;
+
+/**
+ * Class GetSetCssClassesCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
+class GetSetCssClassesCest
+{
+    /**
+     * Tests Phalcon\Flash\Direct :: getCssClasses()/setCssClasses()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetSetCssClasses(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getCssClasses()/setCssClasses()');
+
+        $flash = new Direct();
+
+        $expected   = [
+            'error'   => 'errorMessage',
+            'success' => 'successMessage',
+            'notice'  => 'noticeMessage',
+            'warning' => 'warningMessage',
+        ];
+        $newClasses = [
+            'error'   => 'alert alert-error',
+            'success' => 'alert alert-success',
+            'notice'  => 'alert alert-notice',
+            'warning' => 'alert alert-warning',
+        ];
+
+        $actual = $flash->getCssClasses();
+        $I->assertEquals($expected, $actual);
+
+        $flash->setCssClasses($newClasses);
+
+        $expected = $newClasses;
+        $actual   = $flash->getCssClasses();
+        $I->assertEquals($expected, $actual);
+    }
+}
diff --git a/tests/unit/Flash/Direct/GetSetCssIconClassesCest.php b/tests/unit/Flash/Direct/GetSetCssIconClassesCest.php
new file mode 100644
index 00000000000..4e249529221
--- /dev/null
+++ b/tests/unit/Flash/Direct/GetSetCssIconClassesCest.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Direct;
+
+use Phalcon\Flash\Direct;
+use UnitTester;
+
+/**
+ * Class GetSetCssClassesCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
+class GetSetCssIconClassesCest
+{
+    /**
+     * Tests Phalcon\Flash\Direct :: getCssIconClasses()/setCssIconClasses()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetSetCssIconClasses(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getCssIconClasses()/setCssIconClasses()');
+
+        $flash = new Direct();
+
+        $expected   = [
+            'error'   => 'errorMessage',
+            'success' => 'successMessage',
+            'notice'  => 'noticeMessage',
+            'warning' => 'warningMessage',
+        ];
+        $newClasses = [
+            'error'   => 'alert alert-error',
+            'success' => 'alert alert-success',
+            'notice'  => 'alert alert-notice',
+            'warning' => 'alert alert-warning',
+        ];
+
+        $actual = $flash->getCssIconClasses();
+        $I->assertEmpty($actual);
+
+        $flash->setCssIconClasses($newClasses);
+
+        $expected = $newClasses;
+        $actual   = $flash->getCssIconClasses();
+        $I->assertEquals($expected, $actual);
+    }
+}
diff --git a/tests/unit/Flash/Direct/GetSetCustomTemplateCest.php b/tests/unit/Flash/Direct/GetSetCustomTemplateCest.php
new file mode 100644
index 00000000000..85cce62d4c7
--- /dev/null
+++ b/tests/unit/Flash/Direct/GetSetCustomTemplateCest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Direct;
+
+use Phalcon\Flash\Direct;
+use UnitTester;
+
+/**
+ * Class GetSetCustomTemplateCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
+class GetSetCustomTemplateCest
+{
+    /**
+     * Tests Phalcon\Flash\Direct :: getCustomTemplate()/setCustomTemplate()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetSetCustomTemplate(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getCustomTemplate()/setCustomTemplate()');
+
+        $flash = new Direct();
+
+        $actual = $flash->getCustomTemplate();
+        $I->assertEmpty($actual);
+
+        $template = '<span class="{cssClasses}">{message}</span>';
+        $actual   = $flash->setCustomTemplate($template);
+        $I->assertInstanceOf(Direct::class, $actual);
+
+        $actual = $flash->getCustomTemplate();
+        $I->assertEquals($template, $actual);
+    }
+}
diff --git a/tests/unit/Flash/Direct/GetSetDICest.php b/tests/unit/Flash/Direct/GetSetDICest.php
index 941bb082d5c..745f38ab072 100644
--- a/tests/unit/Flash/Direct/GetSetDICest.php
+++ b/tests/unit/Flash/Direct/GetSetDICest.php
@@ -11,37 +11,37 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Direct;
+namespace Phalcon\Tests\Unit\Flash\Direct;
 
-use Phalcon\Di;
+use Phalcon\Di\Di;
 use Phalcon\Flash\Direct;
 use UnitTester;
 
+/**
+ * Class GetSetDICest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
 class GetSetDICest
 {
     /**
-     * Tests Phalcon\Flash\Direct :: getDI() / setDI()
+     * Tests Phalcon\Flash\Direct :: getDI()/setDI()
+     *
+     * @param UnitTester $I
      *
-     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
-     * @since  2019-12-07
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
      */
     public function flashDirectGetSetDI(UnitTester $I)
     {
-        $I->wantToTest('Flash\Direct - getDI() / setDI()');
+        $I->wantToTest('Flash\Direct - getDI()/setDI()');
 
         $container = new Di();
+        $flash     = new Direct();
+        $flash->setDI($container);
 
-        $oFlashDirect = new Direct();
-
-        $oFlashDirect->setDI($container);
-
-        $I->assertSame(
-            $container,
-            $oFlashDirect->getDI()
-        );
-
-        $class  = Di::class;
-        $actual = $oFlashDirect->getDI();
-        $I->assertInstanceOf($class, $actual);
+        $actual = $flash->getDI();
+        $I->assertSame($container, $actual);
+        $I->assertInstanceOf(Di::class, $actual);
     }
 }
diff --git a/tests/unit/Flash/Direct/GetSetEscaperServiceCest.php b/tests/unit/Flash/Direct/GetSetEscaperServiceCest.php
new file mode 100644
index 00000000000..5f6effb7e0b
--- /dev/null
+++ b/tests/unit/Flash/Direct/GetSetEscaperServiceCest.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Direct;
+
+use Phalcon\Di\Di;
+use Phalcon\Flash\Direct;
+use Phalcon\Flash\Exception;
+use Phalcon\Html\Escaper;
+use UnitTester;
+
+use function spl_object_hash;
+
+/**
+ * Class GetSetEscaperServiceCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
+class GetSetEscaperServiceCest
+{
+    /**
+     * Tests Phalcon\Flash\Direct :: getEscaperService()/setEscaperService()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetSetEscaperService(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getEscaperService()/setEscaperService()');
+
+        $escaper = new Escaper();
+        $flash   = new Direct($escaper);
+
+        $actual = $flash->getEscaperService();
+        $I->assertEquals(spl_object_hash($escaper), spl_object_hash($actual));
+
+        $newEscaper = new Escaper();
+        $actual     = $flash->setEscaperService($newEscaper);
+        $I->assertInstanceOf(Direct::class, $actual);
+
+        $actual = $flash->getEscaperService();
+        $I->assertEquals(spl_object_hash($newEscaper), spl_object_hash($actual));
+    }
+
+    /**
+     * Tests Phalcon\Flash\Direct :: getEscaperService() - container
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetSetEscaperServiceContainer(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getEscaperService() - Container');
+
+        $container = new Di();
+        $escaper   = new Escaper();
+        $container->setShared('escaper', $escaper);
+        $flash = new Direct();
+        $flash->setDI($container);
+
+        $actual = $flash->getEscaperService();
+        $I->assertEquals(spl_object_hash($escaper), spl_object_hash($actual));
+    }
+
+    /**
+     * Tests Phalcon\Flash\Direct :: getEscaperService() - exception
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashDirectGetEscaperServiceException(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - getEscaperService() - exception');
+
+        $I->expectThrowable(
+            new Exception(
+                'A dependency injection container is required to ' .
+                'access the "escaper" service'
+            ),
+            function () {
+                $flash = new Direct();
+
+                $actual = $flash->getEscaperService();
+            }
+        );
+    }
+}
diff --git a/tests/unit/Flash/Direct/Helper/FlashBase.php b/tests/unit/Flash/Direct/Helper/FlashBase.php
deleted file mode 100644
index 5abe64f98fe..00000000000
--- a/tests/unit/Flash/Direct/Helper/FlashBase.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct\Helper;
-
-use Phalcon\Escaper;
-use Phalcon\Flash\AbstractFlash;
-use Phalcon\Flash\Direct;
-use UnitTester;
-
-class FlashBase
-{
-    private $classes     = [];
-    private $notHtml     = false;
-    private $notImplicit = false;
-
-    private $default = [
-        'success' => 'successMessage',
-        'notice'  => 'noticeMessage',
-        'warning' => 'warningMessage',
-        'error'   => 'errorMessage',
-    ];
-
-    /**
-     * Executed before each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _before(UnitTester $I): void
-    {
-    }
-
-    /**
-     * Tests warning (implicit flush)
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    public function testFlashDirectImplicitFlushHtml(UnitTester $I)
-    {
-        $functions = [
-            'error',
-            'success',
-            'notice',
-            'warning',
-        ];
-
-        foreach ($functions as $function) {
-            $this->stringTest($I, $function);
-        }
-    }
-
-    /**
-     * Tests a string with implicit flush Html
-     *
-     * @param  UnitTester $I
-     * @param  string     $function
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    private function stringTest(UnitTester $I, string $function)
-    {
-        $flash = new Direct(new Escaper());
-        $flash->setCssClasses($this->classes);
-
-        $message = 'sample message';
-
-        if ($this->notHtml) {
-            $flash->setAutomaticHtml(false);
-
-            $expected = $message;
-        } else {
-            $expected = sprintf(
-                '<div%s>%s</div>' . PHP_EOL,
-                $this->getClass($function),
-                $message
-            );
-        }
-
-        if ($this->notImplicit) {
-            $flash->setImplicitFlush(false);
-
-            $actual = $flash->$function($message);
-        } else {
-            $actual = $this->getObResponse($flash, $function, $message);
-        }
-
-        $I->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Private function to get the class of the message depending on the classes
-     * set
-     *
-     * @param  string $key
-     * @return string
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    private function getClass(string $key): string
-    {
-        $template = ' class="%s"';
-
-        if ([] === $this->classes) {
-            $class = '';
-        } else {
-            $classes = (is_null($this->classes)) ?
-                $this->default :
-                $this->classes;
-            $class   = sprintf($template, $classes[$key]);
-        }
-
-        return $class;
-    }
-
-    /**
-     * Private function to start the ob, call the function, get the
-     * contents and clean the ob
-     *
-     * @param  AbstractFlash $flash
-     * @param  string        $function
-     * @param  string        $message
-     * @return string
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    private function getObResponse(AbstractFlash $flash, string $function, string $message): string
-    {
-        ob_start();
-        $flash->$function($message);
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        return $actual;
-    }
-
-    /**
-     * Tests warning (no implicit flush)
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    public function testFlashDirectNoImplicitFlushHtml(UnitTester $I)
-    {
-        $functions = [
-            'error',
-            'success',
-            'notice',
-            'warning',
-        ];
-
-        foreach ($functions as $function) {
-            $this->notImplicit = true;
-
-            $this->stringTest($I, $function);
-
-            $this->notImplicit = false;
-        }
-    }
-
-    /**
-     * Tests warning (implicit flush no html)
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    public function testFlashDirectImplicitFlushNoHtml(UnitTester $I)
-    {
-        $functions = [
-            'error',
-            'success',
-            'notice',
-            'warning',
-        ];
-
-        foreach ($functions as $function) {
-            $this->notHtml = true;
-
-            $this->stringTest($I, $function);
-
-            $this->notHtml = false;
-        }
-    }
-
-    /**
-     * Tests error (no implicit flush no html)
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    public function testFlashDirectNoImplicitFlushNoHtml(UnitTester $I)
-    {
-        $functions = [
-            'error',
-            'success',
-            'notice',
-            'warning',
-        ];
-
-        foreach ($functions as $function) {
-            $this->notHtml     = true;
-            $this->notImplicit = true;
-
-            $this->stringTest($I, $function);
-
-            $this->notHtml     = false;
-            $this->notImplicit = false;
-        }
-    }
-
-    /**
-     * Tests auto escaping
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @issue  https://github.com/phalcon/cphalcon/issues/11448
-     * @since  2016-06-15
-     */
-    public function testFlashDirectWithAutoEscaping(UnitTester $I)
-    {
-        $flash = new Direct(new Escaper());
-        $flash->setCssClasses($this->classes);
-
-        $flash->setAutomaticHtml(false);
-        $flash->setImplicitFlush(false);
-
-        $I->assertEquals(
-            '&lt;h1&gt;Hello World!&lt;/h1&gt;',
-            $flash->success('<h1>Hello World!</h1>')
-        );
-
-        $flash->setAutoescape(false);
-
-        $I->assertEquals(
-            '<h1>Hello World!</h1>',
-            $flash->success('<h1>Hello World!</h1>')
-        );
-    }
-
-    /**
-     * Sets the custom classes for the tests
-     *
-     * @param  array $classes
-     * @return void
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2014-10-04
-     */
-    protected function setClasses(array $classes): void
-    {
-        $this->classes = $classes;
-    }
-}
diff --git a/tests/unit/Flash/Direct/MessageCest.php b/tests/unit/Flash/Direct/MessageCest.php
deleted file mode 100644
index b7b81ece35d..00000000000
--- a/tests/unit/Flash/Direct/MessageCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class MessageCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: message()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectMessage(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - message()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/NoticeCest.php b/tests/unit/Flash/Direct/NoticeCest.php
deleted file mode 100644
index e30d20866a2..00000000000
--- a/tests/unit/Flash/Direct/NoticeCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class NoticeCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: notice()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectNotice(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - notice()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/OutputCest.php b/tests/unit/Flash/Direct/OutputCest.php
index 776580554ee..65e74cc6623 100644
--- a/tests/unit/Flash/Direct/OutputCest.php
+++ b/tests/unit/Flash/Direct/OutputCest.php
@@ -11,22 +11,916 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Direct;
+namespace Phalcon\Tests\Unit\Flash\Direct;
 
+use Codeception\Example;
+use Phalcon\Flash\Direct;
+use Phalcon\Html\Escaper;
 use UnitTester;
 
+use function ob_end_clean;
+use function ob_get_contents;
+use function ob_start;
+
+use const PHP_EOL;
+
+/**
+ * Class OutputCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
 class OutputCest
 {
+    /**
+     * Tests Phalcon\Flash\Direct :: output() - combinations
+     *
+     * @dataProvider getExamples
+     *
+     * @param UnitTester $I
+     * @param Example    $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2020-09-09
+     */
+    public function flashDirectOutputCombinations(UnitTester $I, Example $example)
+    {
+        $I->wantToTest('Flash\Direct - output() - ' . $example['label']);
+
+        $flash = new Direct(new Escaper());
+        $flash
+            ->setCssClasses($example['classes'])
+            ->setCssIconClasses($example['iconClasses'])
+            ->setAutomaticHtml($example['autoHtml'])
+            ->setAutoescape($example['autoescape'])
+            ->setCustomTemplate($example['template'])
+            ->setImplicitFlush($example['implicit'])
+        ;
+        $message = $example['message'];
+
+        if (true === $example['implicit']) {
+            ob_start();
+            $flash->success($message);
+            $actual = ob_get_contents();
+            ob_end_clean();
+        } else {
+            $actual = $flash->success($message);
+        }
+
+        $expected = $example['expected'];
+        $I->assertEquals($expected, $actual);
+    }
+
     /**
      * Tests Phalcon\Flash\Direct :: output()
      *
+     * @param UnitTester $I
+     *
      * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @since  2020-09-09
      */
     public function flashDirectOutput(UnitTester $I)
     {
         $I->wantToTest('Flash\Direct - output()');
 
-        $I->skipTest('Need implementation');
+        $flash = new Direct(new Escaper());
+        $flash->setImplicitFlush(false);
+        $flash->success('hello');
+        $flash->warning('goodbye');
+
+        ob_start();
+        $flash->output(false);
+        $actual = ob_get_contents();
+        ob_clean();
+        $expected = '<div class="successMessage">hello</div>' . PHP_EOL .
+            '<div class="warningMessage">goodbye</div>' . PHP_EOL;
+        $I->assertEquals($expected, $actual);
+
+        /**
+         * remove them
+         */
+        ob_start();
+        $flash->output();
+        $actual = ob_get_contents();
+        ob_clean();
+        $expected = '<div class="successMessage">hello</div>' . PHP_EOL .
+            '<div class="warningMessage">goodbye</div>' . PHP_EOL;
+        $I->assertEquals($expected, $actual);
+
+        ob_start();
+        $flash->output();
+        $actual = ob_get_contents();
+        ob_clean();
+        $expected = '';
+        $I->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array[]
+     */
+    private function getExamples(): array
+    {
+        $message     = 'sample <phalcon> message';
+        $template    = '<div class="%cssClass%"><i class="%cssIconClass%"></i> %message%</div>';
+        $classes     = [
+            'error'   => 'errorPhalcon',
+            'success' => 'successPhalcon',
+            'notice'  => 'noticePhalcon',
+            'warning' => 'warningPhalcon',
+        ];
+        $iconClasses = [
+            'error'   => 'errorIconPhalcon',
+            'success' => 'successIconPhalcon',
+            'notice'  => 'noticeIconPhalcon',
+            'warning' => 'warningIconPhalcon',
+        ];
+
+        // 'classes,icon classes,html,escape,implicit,template',
+        return [
+            [
+                'label'       => 'CLS-ICO-HTML-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon"><i class="successIconPhalcon">'
+                    . '</i> sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample <phalcon> message</div>',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample <phalcon> message</div>',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-HTML-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-ICO-XXXX-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class=""></i> sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . 'sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class=""></i> sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . 'sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class=""></i> sample <phalcon> message</div>',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . 'sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class=""></i> sample <phalcon> message</div>',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-HTML-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div class="successPhalcon">'
+                    . 'sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'CLS-XXX-XXXX-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample &lt;phalcon&gt; message</div>',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample &lt;phalcon&gt; message</div>',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample <phalcon> message</div>',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class="successIconPhalcon"></i>'
+                    . ' sample <phalcon> message</div>',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-HTML-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-ICO-XXXX-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class=""></i>'
+                    . ' sample &lt;phalcon&gt; message</div>',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class=""></i>'
+                    . ' sample &lt;phalcon&gt; message</div>',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class=""></i> sample <phalcon> message</div>',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => '<div class="">'
+                    . '<i class=""></i> sample <phalcon> message</div>',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-HTML-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-ESC-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-ESC-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-ESC-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-ESC-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-XXX-IMP-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-XXX-IMP-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => true,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-XXX-XXX-TPL',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => $template,
+            ],
+            [
+                'label'       => 'XXX-XXX-XXXX-XXX-XXX-XXX',
+                'message'     => $message,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+        ];
     }
 }
diff --git a/tests/unit/Flash/Direct/OutputMessageCest.php b/tests/unit/Flash/Direct/OutputMessageCest.php
index 24995e1d0bb..0fec7d7cef0 100644
--- a/tests/unit/Flash/Direct/OutputMessageCest.php
+++ b/tests/unit/Flash/Direct/OutputMessageCest.php
@@ -11,22 +11,94 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Direct;
+namespace Phalcon\Tests\Unit\Flash\Direct;
 
+use Codeception\Example;
+use Phalcon\Flash\Direct;
+use Phalcon\Flash\Exception;
+use Phalcon\Html\Escaper;
 use UnitTester;
 
+use const PHP_EOL;
+
+/**
+ * Class OutputMessageCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Direct
+ */
 class OutputMessageCest
 {
     /**
-     * Tests Phalcon\Flash\Direct :: outputMessage()
+     * Tests Phalcon\Flash\Direct :: outputMessage() - exception
+     *
+     * @param UnitTester $I
      *
      * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @since  2020-09-09
+     */
+    public function flashDirectOutputMessageException(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Direct - outputMessage() - exception');
+
+        $I->expectThrowable(
+            new Exception('The message must be an array or a string'),
+            function () {
+                $flash   = new Direct(new Escaper());
+                $message = $flash->outputMessage('success', false);
+            }
+        );
+    }
+
+    /**
+     * Tests Phalcon\Flash\Direct :: outputMessage() - exception
+     *
+     * @dataProvider getExamples
+     *
+     * @param UnitTester $I
+     * @param Example    $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2020-09-09
      */
-    public function flashDirectOutputMessage(UnitTester $I)
+    public function flashDirectOutputMessage(UnitTester $I, Example $example)
     {
-        $I->wantToTest('Flash\Direct - outputMessage()');
+        $I->wantToTest('Flash\Direct - outputMessage() - ' . $example[0]);
+
+        $flash = new Direct(new Escaper());
+        $flash->setImplicitFlush(false);
+
+        $source   = 'sample <phalcon> message';
+        $type     = $example[0];
+        $expected = '<div class="' . $type . 'Message">'
+            . 'sample &lt;phalcon&gt; message</div>' . PHP_EOL;
+        $actual   = $flash->outputMessage($type, $source);
+        $I->assertEquals($expected, $actual);
+
+        $actual = $flash->message($type, $source);
+        $I->assertEquals($expected, $actual);
 
-        $I->skipTest('Need implementation');
+        $actual = $flash->$type($source);
+        $I->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    private function getExamples(): array
+    {
+        return [
+            [
+                'error',
+            ],
+            [
+                'notice',
+            ],
+            [
+                'success',
+            ],
+            [
+                'warning',
+            ],
+        ];
     }
 }
diff --git a/tests/unit/Flash/Direct/SetAutoescapeCest.php b/tests/unit/Flash/Direct/SetAutoescapeCest.php
deleted file mode 100644
index fff3ab3dd65..00000000000
--- a/tests/unit/Flash/Direct/SetAutoescapeCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SetAutoescapeCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setAutoescape()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSetAutoescape(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - setAutoescape()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/SetAutomaticHtmlCest.php b/tests/unit/Flash/Direct/SetAutomaticHtmlCest.php
deleted file mode 100644
index 381add479b5..00000000000
--- a/tests/unit/Flash/Direct/SetAutomaticHtmlCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SetAutomaticHtmlCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setAutomaticHtml()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSetAutomaticHtml(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - setAutomaticHtml()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/SetCssClassesCest.php b/tests/unit/Flash/Direct/SetCssClassesCest.php
deleted file mode 100644
index 6d80e089142..00000000000
--- a/tests/unit/Flash/Direct/SetCssClassesCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SetCssClassesCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setCssClasses()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSetCssClasses(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - setCssClasses()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/SetCssIconClassesCest.php b/tests/unit/Flash/Direct/SetCssIconClassesCest.php
deleted file mode 100644
index b53462d1353..00000000000
--- a/tests/unit/Flash/Direct/SetCssIconClassesCest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use Codeception\Example;
-use Phalcon\Escaper;
-use Phalcon\Flash\Direct;
-use UnitTester;
-
-use const PHP_EOL;
-
-class SetCssIconClassesCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setCssIconClasses()
-     *
-     * @param UnitTester $I
-     * @param Example    $example
-     *
-     * @dataProvider getExamples
-     *
-     * @author       Phalcon Team <team@phalcon.io>
-     * @since        2021-08-13
-     */
-    public function flashDirectSetCssIconClasses(UnitTester $I, Example $example)
-    {
-        $I->wantToTest('Flash\Direct - setCssIconClasses() - ' . $example[0]);
-
-        $flash = $this->setupFlash();
-
-        $actual   = $flash->{$example[0]}('test');
-        $expected = "<div class=\"{$example[1]}\"><i class=\"%cssIconClasses%\"></i> test</div>" . PHP_EOL;
-        $I->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Tests Phalcon\Flash\Direct :: setCssIconClasses() - custom template
-     *
-     * @param UnitTester $I
-     * @param Example    $example
-     *
-     * @dataProvider getExamples
-     *
-     * @author       Phalcon Team <team@phalcon.io>
-     * @since        2021-08-13
-     */
-    public function flashDirectSetCssIconClassesCustomTemplate(UnitTester $I, Example $example)
-    {
-        $I->wantToTest('Flash\Direct - setCssIconClasses() - custom template - ' . $example[0]);
-
-        $template = '<div class="%cssClass%"><i class="%iconCssClass%"></i> %message% '
-            . '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>'
-            . '</div>';
-        $flash    = $this->setupFlash();
-
-        $flash->setCustomTemplate($template);
-        $actual   = $flash->{$example[0]}('test');
-        $expected = "<div class=\"{$example[1]}\"><i class=\"{$example[2]}\"></i> test "
-            . '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>'
-            . '</div>';
-        $I->assertEquals($expected, $actual);
-    }
-
-    /**
-     * @return \string[][]
-     */
-    private function getExamples(): array
-    {
-        return [
-            [
-                'error',
-                'errorPhalcon',
-                'errorIconPhalcon',
-            ],
-            [
-                'success',
-                'successPhalcon',
-                'successIconPhalcon',
-            ],
-            [
-                'notice',
-                'noticePhalcon',
-                'noticeIconPhalcon',
-            ],
-            [
-                'warning',
-                'warningPhalcon',
-                'warningIconPhalcon',
-            ],
-        ];
-    }
-
-    private function setupFlash(): Direct
-    {
-        $flash = new Direct(new Escaper());
-
-        $flash
-            ->setImplicitFlush(false)
-            ->setCssClasses(
-                [
-                    'error'   => 'errorPhalcon',
-                    'success' => 'successPhalcon',
-                    'notice'  => 'noticePhalcon',
-                    'warning' => 'warningPhalcon',
-                ]
-            )
-            ->setCssIconClasses(
-                [
-                    'error'   => 'errorIconPhalcon',
-                    'success' => 'successIconPhalcon',
-                    'notice'  => 'noticeIconPhalcon',
-                    'warning' => 'warningIconPhalcon',
-                ]
-            )
-        ;
-
-        return $flash;
-    }
-}
diff --git a/tests/unit/Flash/Direct/SetCustomTemplateCest.php b/tests/unit/Flash/Direct/SetCustomTemplateCest.php
deleted file mode 100644
index a001294b48f..00000000000
--- a/tests/unit/Flash/Direct/SetCustomTemplateCest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SetCustomTemplateCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setCustomTemplate()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSetCustomTemplate(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - setCustomTemplate()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/SetEscaperServiceCest.php b/tests/unit/Flash/Direct/SetEscaperServiceCest.php
deleted file mode 100644
index d06fbb9db53..00000000000
--- a/tests/unit/Flash/Direct/SetEscaperServiceCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SetEscaperServiceCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setEscaperService()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSetEscaperService(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - setEscaperService()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/SetImplicitFlushCest.php b/tests/unit/Flash/Direct/SetImplicitFlushCest.php
deleted file mode 100644
index e78ae94ec7c..00000000000
--- a/tests/unit/Flash/Direct/SetImplicitFlushCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SetImplicitFlushCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: setImplicitFlush()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSetImplicitFlush(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - setImplicitFlush()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/SuccessCest.php b/tests/unit/Flash/Direct/SuccessCest.php
deleted file mode 100644
index ed30956a45e..00000000000
--- a/tests/unit/Flash/Direct/SuccessCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class SuccessCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: success()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectSuccess(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - success()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Direct/WarningCest.php b/tests/unit/Flash/Direct/WarningCest.php
deleted file mode 100644
index b12ddca19da..00000000000
--- a/tests/unit/Flash/Direct/WarningCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Direct;
-
-use UnitTester;
-
-class WarningCest
-{
-    /**
-     * Tests Phalcon\Flash\Direct :: warning()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashDirectWarning(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Direct - warning()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/DirectCest.php b/tests/unit/Flash/DirectCest.php
deleted file mode 100644
index ae91a77df75..00000000000
--- a/tests/unit/Flash/DirectCest.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-namespace Phalcon\Test\Unit\Flash;
-
-use Codeception\Example;
-use Phalcon\Flash\Direct;
-use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use UnitTester;
-
-class DirectCest
-{
-    use DiTrait;
-
-    /**
-     * @var array
-     */
-    protected $classes = [
-        'success' => 'successMessage',
-        'notice'  => 'noticeMessage',
-        'warning' => 'warningMessage',
-        'error'   => 'errorMessage',
-    ];
-
-    /**
-     * Executed before each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _before(UnitTester $I): void
-    {
-        $this->newDi();
-
-        try {
-            $this->setDiService('escaper');
-        } catch (Exception $e) {
-            $I->fail($e->getMessage());
-        }
-    }
-
-    /**
-     * Tests auto escaping
-     *
-     * @param  UnitTester $I
-     * @param  Example $example
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @issue  https://github.com/phalcon/cphalcon/issues/11448
-     * @since  2016-06-15
-     *
-     * @dataProvider testShouldAutoEscapeHtmlProvider
-     */
-    public function testShouldAutoEscapeHtml(UnitTester $I, Example $example)
-    {
-        $function = $example[0];
-
-        $flash = $this->getFlash();
-
-
-        $flash->setAutoescape(false);
-
-        ob_start();
-        $flash->$function(
-            "<script>alert('This will execute as JavaScript!')</script>"
-        );
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            "<div class=\"{$function}Message\">" .
-            "<script>alert('This will execute as JavaScript!')</script></div>" . PHP_EOL,
-            $actual
-        );
-
-
-        $flash->setAutoescape(true);
-
-        ob_start();
-        $flash->$function(
-            "<script>alert('This will execute as JavaScript!')</script>"
-        );
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            "<div class=\"{$function}Message\">" .
-            "&lt;script&gt;alert(&#039;This will execute as JavaScript!" .
-            "&#039;)&lt;/script&gt;</div>" . PHP_EOL,
-            $actual
-        );
-    }
-
-    private function testShouldAutoEscapeHtmlProvider(): array
-    {
-        return [
-            ['error'],
-            ['success'],
-            ['notice'],
-            ['warning'],
-        ];
-    }
-
-    /**
-     * Return flash instance
-     */
-    protected function getFlash()
-    {
-        $container = $this->getDi();
-
-        $flash = new Direct();
-        $flash->setDI($container);
-        $flash->setCssClasses($this->classes);
-
-        return $flash;
-    }
-
-    /**
-     * Test output formatted messages
-     *
-     * @param  UnitTester $I
-     * @param  Example $example
-     *
-     * @author       Iván Guillén <zeopix@gmail.com>
-     * @since        2015-10-26
-     *
-     * @dataProvider testMessageFormatProvider
-     */
-    public function testMessageFormat(UnitTester $I, Example $example)
-    {
-        $function = $example[0];
-
-        $flash = $this->getFlash();
-
-        $class = sprintf(
-            ' class="%s"',
-            $this->classes[$function]
-        );
-
-        $message = 'sample message';
-
-        $expected = sprintf(
-            '<div%s>%s</div>' . PHP_EOL,
-            $class,
-            $message
-        );
-
-        ob_start();
-        $flash->$function($message);
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals($expected, $actual);
-    }
-
-    private function testMessageFormatProvider(): array
-    {
-        return [
-            ['error'],
-            ['success'],
-            ['notice'],
-        ];
-    }
-
-    /**
-     * Test custom message
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @issue  https://github.com/phalcon/cphalcon/issues/13445
-     * @since  2018-10-16
-     */
-    public function testCustomFormat(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        $template = '<span class="%cssClass%" aria-label="clickme">%message%</span>';
-
-        $flash->setCustomTemplate($template);
-
-        $message = 'sample message';
-
-        ob_start();
-        $flash->success($message);
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            '<span class="successMessage" aria-label="clickme">sample message</span>',
-            $actual
-        );
-    }
-}
diff --git a/tests/unit/Flash/Session/ClearCest.php b/tests/unit/Flash/Session/ClearCest.php
deleted file mode 100644
index 1031beacd96..00000000000
--- a/tests/unit/Flash/Session/ClearCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionClear(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - clear()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/ClearHasCest.php b/tests/unit/Flash/Session/ClearHasCest.php
new file mode 100644
index 00000000000..79f984c0496
--- /dev/null
+++ b/tests/unit/Flash/Session/ClearHasCest.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Session;
+
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use UnitTester;
+
+use function uniqid;
+
+/**
+ * Class ClearHasCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
+class ClearHasCest
+{
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: clear()/has()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionClearHas(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - clear()/has');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $message1 = uniqid('m-');
+        $message2 = uniqid('m-');
+        $flash->success($message1);
+        $flash->error($message2);
+
+        $actual = $flash->has();
+        $I->assertTrue($actual);
+
+        $actual = $flash->has('success');
+        $I->assertTrue($actual);
+
+        $actual = $flash->has('error');
+        $I->assertTrue($actual);
+
+        $actual = $flash->has('warning');
+        $I->assertFalse($actual);
+
+        $actual = $flash->has('notice');
+        $I->assertFalse($actual);
+
+        $expected = [$message1];
+        $actual   = $flash->getMessages('success', false);
+        $I->assertEquals($expected, $actual);
+
+        $expected = [$message2];
+        $actual   = $flash->getMessages('error', false);
+        $I->assertEquals($expected, $actual);
+
+        $flash->clear();
+
+        $actual = $flash->getMessages();
+        $I->assertEmpty($actual);
+
+        $session->destroy();
+    }
+}
diff --git a/tests/unit/Flash/Session/ConstructCest.php b/tests/unit/Flash/Session/ConstructCest.php
index 3896b164cc2..db2c95678ed 100644
--- a/tests/unit/Flash/Session/ConstructCest.php
+++ b/tests/unit/Flash/Session/ConstructCest.php
@@ -11,22 +11,64 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Session;
+namespace Phalcon\Tests\Unit\Flash\Session;
 
+use Phalcon\Flash\Exception;
+use Phalcon\Flash\FlashInterface;
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
+/**
+ * Class ConstructCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
 class ConstructCest
 {
+    use DiTrait;
+
     /**
      * Tests Phalcon\Flash\Session :: __construct()
      *
+     * @param UnitTester $I
+     *
      * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @since  2020-09-09
      */
     public function flashSessionConstruct(UnitTester $I)
     {
         $I->wantToTest('Flash\Session - __construct()');
 
-        $I->skipTest('Need implementation');
+
+        $flash = new Session();
+        $I->assertInstanceOf(FlashInterface::class, $flash);
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: __construct() - no session service
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionConstructNoSessionService(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - __construct() - no session service');
+
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+
+        $I->expectThrowable(
+            new Exception(
+                'A dependency injection container is required to ' .
+                'access the "session" service'
+            ),
+            function () {
+                $flash = new Session();
+                $flash->getMessages();
+            }
+        );
     }
 }
diff --git a/tests/unit/Flash/Session/ErrorCest.php b/tests/unit/Flash/Session/ErrorCest.php
deleted file mode 100644
index 32cd809e8f0..00000000000
--- a/tests/unit/Flash/Session/ErrorCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class ErrorCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: error()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionError(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - error()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/GetAutoescapeCest.php b/tests/unit/Flash/Session/GetAutoescapeCest.php
deleted file mode 100644
index fd07869d966..00000000000
--- a/tests/unit/Flash/Session/GetAutoescapeCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class GetAutoescapeCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: getAutoescape()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionGetAutoescape(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - getAutoescape()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/GetCustomTemplateCest.php b/tests/unit/Flash/Session/GetCustomTemplateCest.php
deleted file mode 100644
index 7c1197285c3..00000000000
--- a/tests/unit/Flash/Session/GetCustomTemplateCest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class GetCustomTemplateCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: getCustomTemplate()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionGetCustomTemplate(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - getCustomTemplate()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/GetEscaperServiceCest.php b/tests/unit/Flash/Session/GetEscaperServiceCest.php
deleted file mode 100644
index 0dc0d46ab23..00000000000
--- a/tests/unit/Flash/Session/GetEscaperServiceCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class GetEscaperServiceCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: getEscaperService()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionGetEscaperService(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - getEscaperService()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/GetMessagesCest.php b/tests/unit/Flash/Session/GetMessagesCest.php
index 25cb22bf901..d6e3d1bad52 100644
--- a/tests/unit/Flash/Session/GetMessagesCest.php
+++ b/tests/unit/Flash/Session/GetMessagesCest.php
@@ -11,22 +11,85 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Session;
+namespace Phalcon\Tests\Unit\Flash\Session;
 
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
+use function uniqid;
+
+/**
+ * Class GetMessagesCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
 class GetMessagesCest
 {
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+    }
+
     /**
      * Tests Phalcon\Flash\Session :: getMessages()
      *
+     * @param UnitTester $I
+     *
      * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @since  2020-09-09
      */
     public function flashSessionGetMessages(UnitTester $I)
     {
         $I->wantToTest('Flash\Session - getMessages()');
 
-        $I->skipTest('Need implementation');
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $message1 = uniqid('m-');
+        $message2 = uniqid('m-');
+        $flash->success($message1);
+        $flash->error($message2);
+
+        $expected = [
+            'success' => [$message1],
+            'error'   => [$message2],
+        ];
+        $actual   = $flash->getMessages();
+        $I->assertEquals($expected, $actual);
+
+        $message1 = uniqid('m-');
+        $message2 = uniqid('m-');
+        $message3 = uniqid('m-');
+        $flash->success($message1);
+        $flash->error($message2);
+        $flash->warning($message3);
+
+        $expected = [$message1];
+        $actual   = $flash->getMessages('success', false);
+        $I->assertEquals($expected, $actual);
+
+        $expected = [$message2];
+        $actual   = $flash->getMessages('error', false);
+        $I->assertEquals($expected, $actual);
+
+        $expected = [$message3];
+        $actual   = $flash->getMessages('warning', true);
+        $I->assertEquals($expected, $actual);
+
+        $expected = [
+            'success' => [$message1],
+            'error'   => [$message2],
+        ];
+        $actual   = $flash->getMessages();
+        $I->assertEquals($expected, $actual);
+
+        $session->destroy();
     }
 }
diff --git a/tests/unit/Flash/Session/GetSetAutoescapeCest.php b/tests/unit/Flash/Session/GetSetAutoescapeCest.php
new file mode 100644
index 00000000000..6e1a416ee52
--- /dev/null
+++ b/tests/unit/Flash/Session/GetSetAutoescapeCest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Session;
+
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use UnitTester;
+
+/**
+ * Class GetAutoescapeCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
+class GetSetAutoescapeCest
+{
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getAutoescape()/setAutoescape()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetSetAutoescape(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getAutoescape()/setAutoescape()');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $actual = $flash->getAutoescape();
+        $I->assertTrue($actual);
+
+        $actual = $flash->setAutoescape(false);
+        $I->assertInstanceOf(Session::class, $actual);
+
+        $actual = $flash->getAutoescape();
+        $I->assertFalse($actual);
+
+        $session->destroy();
+    }
+}
diff --git a/tests/unit/Flash/Session/GetSetCssClassesCest.php b/tests/unit/Flash/Session/GetSetCssClassesCest.php
new file mode 100644
index 00000000000..fa4b42efc01
--- /dev/null
+++ b/tests/unit/Flash/Session/GetSetCssClassesCest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Session;
+
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use UnitTester;
+
+/**
+ * Class GetSetCssClassesCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
+class GetSetCssClassesCest
+{
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getCssClasses()/setCssClasses()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetSetCssClasses(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getCssClasses()/setCssClasses()');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $expected   = [
+            'error'   => 'errorMessage',
+            'success' => 'successMessage',
+            'notice'  => 'noticeMessage',
+            'warning' => 'warningMessage',
+        ];
+        $newClasses = [
+            'error'   => 'alert alert-error',
+            'success' => 'alert alert-success',
+            'notice'  => 'alert alert-notice',
+            'warning' => 'alert alert-warning',
+        ];
+
+        $actual = $flash->getCssClasses();
+        $I->assertEquals($expected, $actual);
+
+        $flash->setCssClasses($newClasses);
+
+        $expected = $newClasses;
+        $actual   = $flash->getCssClasses();
+        $I->assertEquals($expected, $actual);
+
+        $session->destroy();
+    }
+}
diff --git a/tests/unit/Flash/Session/GetSetCssIconClassesCest.php b/tests/unit/Flash/Session/GetSetCssIconClassesCest.php
new file mode 100644
index 00000000000..112a45b384a
--- /dev/null
+++ b/tests/unit/Flash/Session/GetSetCssIconClassesCest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Session;
+
+use Phalcon\Flash\Direct;
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use UnitTester;
+
+/**
+ * Class GetSetCssClassesCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
+class GetSetCssIconClassesCest
+{
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getCssIconClasses()/setCssIconClasses()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetSetCssIconClasses(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getCssIconClasses()/setCssIconClasses()');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $expected   = [
+            'error'   => 'errorMessage',
+            'success' => 'successMessage',
+            'notice'  => 'noticeMessage',
+            'warning' => 'warningMessage',
+        ];
+        $newClasses = [
+            'error'   => 'alert alert-error',
+            'success' => 'alert alert-success',
+            'notice'  => 'alert alert-notice',
+            'warning' => 'alert alert-warning',
+        ];
+
+        $actual = $flash->getCssIconClasses();
+        $I->assertEmpty($actual);
+
+        $flash->setCssIconClasses($newClasses);
+
+        $expected = $newClasses;
+        $actual   = $flash->getCssIconClasses();
+        $I->assertEquals($expected, $actual);
+
+        $session->destroy();
+    }
+}
diff --git a/tests/unit/Flash/Session/GetSetCustomTemplateCest.php b/tests/unit/Flash/Session/GetSetCustomTemplateCest.php
new file mode 100644
index 00000000000..b0108af72c3
--- /dev/null
+++ b/tests/unit/Flash/Session/GetSetCustomTemplateCest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Session;
+
+use Phalcon\Flash\Session;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use UnitTester;
+
+/**
+ * Class GetSetCustomTemplateCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
+class GetSetCustomTemplateCest
+{
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiService('sessionStream');
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getCustomTemplate()/setCustomTemplate()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetSetCustomTemplate(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getCustomTemplate()/setCustomTemplate()');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $actual = $flash->getCustomTemplate();
+        $I->assertEmpty($actual);
+
+        $template = '<span class="{cssClasses}">{message}</span>';
+        $actual   = $flash->setCustomTemplate($template);
+        $I->assertInstanceOf(Session::class, $actual);
+
+        $actual = $flash->getCustomTemplate();
+        $I->assertEquals($template, $actual);
+
+        $session->destroy();
+    }
+}
diff --git a/tests/unit/Flash/Session/GetSetDICest.php b/tests/unit/Flash/Session/GetSetDICest.php
index 99abc2f4180..a17a4913e74 100644
--- a/tests/unit/Flash/Session/GetSetDICest.php
+++ b/tests/unit/Flash/Session/GetSetDICest.php
@@ -11,37 +11,37 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Session;
+namespace Phalcon\Tests\Unit\Flash\Session;
 
-use Phalcon\Di;
-use Phalcon\Flash\Session as FlashSession;
+use Phalcon\Di\Di;
+use Phalcon\Flash\Session;
 use UnitTester;
 
+/**
+ * Class GetSetDICest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
 class GetSetDICest
 {
     /**
-     * Tests Phalcon\Flash\Session :: getDI() / setDI()
+     * Tests Phalcon\Flash\Session :: getDI()/setDI()
+     *
+     * @param UnitTester $I
      *
-     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
-     * @since  2019-12-07
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
      */
-    public function flashSessionSetDI(UnitTester $I)
+    public function flashSessionGetSetDI(UnitTester $I)
     {
-        $I->wantToTest('Flash\Session - getDI() / setDI()');
+        $I->wantToTest('Flash\Session - getDI()/setDI()');
 
         $container = new Di();
+        $flash     = new Session();
+        $flash->setDI($container);
 
-        $oFlashSession = new FlashSession();
-
-        $oFlashSession->setDI($container);
-
-        $I->assertSame(
-            $container,
-            $oFlashSession->getDI()
-        );
-
-        $class  = Di::class;
-        $actual = $oFlashSession->getDI();
-        $I->assertInstanceOf($class, $actual);
+        $actual = $flash->getDI();
+        $I->assertSame($container, $actual);
+        $I->assertInstanceOf(Di::class, $actual);
     }
 }
diff --git a/tests/unit/Flash/Session/GetSetEscaperServiceCest.php b/tests/unit/Flash/Session/GetSetEscaperServiceCest.php
new file mode 100644
index 00000000000..5ac667e10d3
--- /dev/null
+++ b/tests/unit/Flash/Session/GetSetEscaperServiceCest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Unit\Flash\Session;
+
+use Phalcon\Flash\Exception;
+use Phalcon\Flash\Session;
+use Phalcon\Html\Escaper;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use UnitTester;
+
+use function spl_object_hash;
+
+/**
+ * Class GetSetEscaperServiceCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
+class GetSetEscaperServiceCest
+{
+    use DiTrait;
+
+    public function _before(UnitTester $I)
+    {
+        $this->newDi();
+        $this->setDiService('sessionStream');
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getEscaperService()/setEscaperService()
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetSetEscaperService(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getEscaperService()/setEscaperService()');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $escaper = new Escaper();
+        $flash   = new Session($escaper);
+
+        $actual = $flash->getEscaperService();
+        $I->assertEquals(spl_object_hash($escaper), spl_object_hash($actual));
+
+        $newEscaper = new Escaper();
+        $actual     = $flash->setEscaperService($newEscaper);
+        $I->assertInstanceOf(Session::class, $actual);
+
+        $actual = $flash->getEscaperService();
+        $I->assertEquals(spl_object_hash($newEscaper), spl_object_hash($actual));
+
+        $session->destroy();
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getEscaperService() - container
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetSetEscaperServiceContainer(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getEscaperService() - Container');
+
+        $escaper = new Escaper();
+        $this->container->setShared('escaper', $escaper);
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $actual = $flash->getEscaperService();
+        $I->assertEquals(spl_object_hash($escaper), spl_object_hash($actual));
+    }
+
+    /**
+     * Tests Phalcon\Flash\Session :: getEscaperService() - exception
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
+     */
+    public function flashSessionGetEscaperServiceException(UnitTester $I)
+    {
+        $I->wantToTest('Flash\Session - getEscaperService() - exception');
+
+        $I->expectThrowable(
+            new Exception(
+                'A dependency injection container is required to ' .
+                'access the "escaper" service'
+            ),
+            function () {
+                $flash = new Session();
+
+                $actual = $flash->getEscaperService();
+            }
+        );
+    }
+}
diff --git a/tests/unit/Flash/Session/HasCest.php b/tests/unit/Flash/Session/HasCest.php
deleted file mode 100644
index c0ebb302ef8..00000000000
--- a/tests/unit/Flash/Session/HasCest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use Phalcon\Flash\Session;
-use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use UnitTester;
-
-class HasCest
-{
-    use DiTrait;
-
-    public function _before(UnitTester $I): void
-    {
-        $this->newDi();
-
-        try {
-            $this->setDiService('escaper');
-            $this->setDiService('sessionStream');
-        } catch (Exception $e) {
-            $I->fail($e->getMessage());
-        }
-
-        if (PHP_SESSION_ACTIVE !== session_status()) {
-            session_start();
-        }
-
-        if (!isset($_SESSION)) {
-            $_SESSION = [];
-        }
-    }
-
-    /**
-     * Executed after each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _after(UnitTester $I): void
-    {
-        session_destroy();
-    }
-
-    /**
-     * Return flash instance
-     */
-    protected function getFlash(): Session
-    {
-        $container = $this->getDi();
-
-        $flash = new Session();
-        $flash->setDI($container);
-
-        return $flash;
-    }
-
-    /**
-     * Tests Phalcon\Flash\Session :: has()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2021-03-30
-     */
-    public function flashSessionHas(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        $I->assertFalse($flash->has());
-
-        $flash->success("test success");
-
-        $I->assertTrue($flash->has());
-
-        $I->assertFalse($flash->has("error"));
-
-        $I->assertTrue($flash->has("success"));
-    }
-}
diff --git a/tests/unit/Flash/Session/MessageCest.php b/tests/unit/Flash/Session/MessageCest.php
deleted file mode 100644
index 139c0d7f82f..00000000000
--- a/tests/unit/Flash/Session/MessageCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class MessageCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: message()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionMessage(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - message()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/NoticeCest.php b/tests/unit/Flash/Session/NoticeCest.php
deleted file mode 100644
index 5d422bf747d..00000000000
--- a/tests/unit/Flash/Session/NoticeCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class NoticeCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: notice()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionNotice(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - notice()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/OutputCest.php b/tests/unit/Flash/Session/OutputCest.php
index ec4f88915c0..fda5a0af143 100644
--- a/tests/unit/Flash/Session/OutputCest.php
+++ b/tests/unit/Flash/Session/OutputCest.php
@@ -11,56 +11,51 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Flash\Session;
+namespace Phalcon\Tests\Unit\Flash\Session;
 
 use Phalcon\Flash\Session;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
+use function ob_end_clean;
+use function ob_get_contents;
+use function ob_start;
+use function uniqid;
+
+use const PHP_EOL;
+
+/**
+ * Class OutputCest
+ *
+ * @package Phalcon\Tests\Unit\Flash\Session
+ */
 class OutputCest
 {
     use DiTrait;
 
-    /**
-     * @var array
-     */
-    protected $classes = [
-        'success' => 'successMessage',
-        'notice'  => 'noticeMessage',
-        'warning' => 'warningMessage',
-        'error'   => 'errorMessage',
-    ];
-
     public function _before(UnitTester $I)
     {
-        $this->newDi();
-        $this->setDiService('escaper');
+        $this->setNewFactoryDefault();
         $this->setDiService('sessionStream');
     }
 
     /**
-     * Tests Phalcon\Flash\Session :: output()
+     * Tests Phalcon\Flash\Session :: output() - empty session
+     *
+     * @param UnitTester $I
      *
      * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @since  2020-09-09
      */
     public function flashSessionOutput(UnitTester $I)
     {
-        $I->wantToTest('Flash\Session - output()');
-        $I->skipTest('Need implementation');
-    }
+        $I->wantToTest('Flash\Session - output() - empty session');
 
-    /**
-     * Tests Phalcon\Flash\Session :: output() in case the session is empty
-     *
-     * @author Balázs Németh <https://github.com/zsilbi>
-     * @since  2019-04-29
-     */
-    public function emptyFlashSessionOutput(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - output() when session is empty');
+        $session = $this->container->getShared('session');
+        $session->start();
 
-        $flash = $this->getFlash();
+        $flash = new Session();
+        $flash->setDI($this->container);
 
         $flash->clear();
 
@@ -70,18 +65,48 @@ public function emptyFlashSessionOutput(UnitTester $I)
         ob_end_clean();
 
         $I->assertEmpty($result);
+
+        $session->destroy();
     }
 
     /**
-     * Return flash instance
+     * Tests Phalcon\Flash\Session :: output() - types
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2020-09-09
      */
-    protected function getFlash()
+    public function flashSessionOutputTypes(UnitTester $I)
     {
-        $container = $this->getDi();
-        $flash     = new Session();
-        $flash->setDI($container);
-        $flash->setCssClasses($this->classes);
+        $I->wantToTest('Flash\Session - output() - types');
+
+        $session = $this->container->getShared('session');
+        $session->start();
+
+        $flash = new Session();
+        $flash->setDI($this->container);
+
+        $message1 = uniqid('m-');
+        $message2 = uniqid('m-');
+        $flash->success($message1);
+        $flash->error($message2);
+
+        ob_start();
+        $flash->output();
+        $actual = ob_get_contents();
+        ob_end_clean();
+        $expected = '<div class="successMessage">' . $message1 . '</div>' . PHP_EOL
+            . '<div class="errorMessage">' . $message2 . '</div>' . PHP_EOL;
+        $I->assertEquals($expected, $actual);
+
+        ob_start();
+        $flash->output();
+        $actual = ob_get_contents();
+        ob_end_clean();
+        $expected = '';
+        $I->assertEquals($expected, $actual);
 
-        return $flash;
+        $session->destroy();
     }
 }
diff --git a/tests/unit/Flash/Session/OutputMessageCest.php b/tests/unit/Flash/Session/OutputMessageCest.php
deleted file mode 100644
index 82031577c44..00000000000
--- a/tests/unit/Flash/Session/OutputMessageCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class OutputMessageCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: outputMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionOutputMessage(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - outputMessage()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/SetAutoescapeCest.php b/tests/unit/Flash/Session/SetAutoescapeCest.php
deleted file mode 100644
index 92aebcb51d1..00000000000
--- a/tests/unit/Flash/Session/SetAutoescapeCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class SetAutoescapeCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: setAutoescape()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionSetAutoescape(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - setAutoescape()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/SetAutomaticHtmlCest.php b/tests/unit/Flash/Session/SetAutomaticHtmlCest.php
deleted file mode 100644
index a4e3873d07c..00000000000
--- a/tests/unit/Flash/Session/SetAutomaticHtmlCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class SetAutomaticHtmlCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: setAutomaticHtml()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionSetAutomaticHtml(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - setAutomaticHtml()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/SetCssClassesCest.php b/tests/unit/Flash/Session/SetCssClassesCest.php
deleted file mode 100644
index 0d2a1bc1f0c..00000000000
--- a/tests/unit/Flash/Session/SetCssClassesCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class SetCssClassesCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: setCssClasses()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionSetCssClasses(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - setCssClasses()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/SetCustomTemplateCest.php b/tests/unit/Flash/Session/SetCustomTemplateCest.php
deleted file mode 100644
index 483aa49e39d..00000000000
--- a/tests/unit/Flash/Session/SetCustomTemplateCest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use Phalcon\Flash\Session;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use UnitTester;
-
-class SetCustomTemplateCest
-{
-    use DiTrait;
-
-    /**
-     * @var array
-     */
-    protected $classes = [
-        'success' => 'successMessage',
-        'notice'  => 'noticeMessage',
-        'warning' => 'warningMessage',
-        'error'   => 'errorMessage',
-    ];
-
-    public function _before(UnitTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('sessionStream');
-    }
-
-    /**
-     * Return flash instance
-     */
-    protected function getFlash()
-    {
-        $container = $this->getDi();
-
-        $flash = new Session();
-        $flash->setDI($container);
-        $flash->setCssClasses($this->classes);
-
-        return $flash;
-    }
-
-    /**
-     * Test custom template getter/setter
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @issue  https://github.com/phalcon/cphalcon/issues/13445
-     * @since  2018-10-16
-     */
-    public function testCustomTemplateGetterSetter(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        $template = '<span class="%cssClasses%">%message%</span>';
-
-        $flash->setCustomTemplate($template);
-
-        $I->assertEquals(
-            $template,
-            $flash->getCustomTemplate()
-        );
-    }
-}
diff --git a/tests/unit/Flash/Session/SetEscaperServiceCest.php b/tests/unit/Flash/Session/SetEscaperServiceCest.php
deleted file mode 100644
index 1c56e94e61b..00000000000
--- a/tests/unit/Flash/Session/SetEscaperServiceCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class SetEscaperServiceCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: setEscaperService()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionSetEscaperService(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - setEscaperService()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/SetImplicitFlushCest.php b/tests/unit/Flash/Session/SetImplicitFlushCest.php
deleted file mode 100644
index 4190f0df9fc..00000000000
--- a/tests/unit/Flash/Session/SetImplicitFlushCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class SetImplicitFlushCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: setImplicitFlush()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionSetImplicitFlush(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - setImplicitFlush()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/SuccessCest.php b/tests/unit/Flash/Session/SuccessCest.php
deleted file mode 100644
index 3f79d7b77fe..00000000000
--- a/tests/unit/Flash/Session/SuccessCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class SuccessCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: success()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionSuccess(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - success()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/Session/WarningCest.php b/tests/unit/Flash/Session/WarningCest.php
deleted file mode 100644
index beaab48cc31..00000000000
--- a/tests/unit/Flash/Session/WarningCest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Test\Unit\Flash\Session;
-
-use UnitTester;
-
-class WarningCest
-{
-    /**
-     * Tests Phalcon\Flash\Session :: warning()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function flashSessionWarning(UnitTester $I)
-    {
-        $I->wantToTest('Flash\Session - warning()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Flash/SessionCest.php b/tests/unit/Flash/SessionCest.php
deleted file mode 100644
index fb3e36c8171..00000000000
--- a/tests/unit/Flash/SessionCest.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-namespace Phalcon\Test\Unit\Flash;
-
-use Codeception\Example;
-use Phalcon\Flash\Session;
-use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use UnitTester;
-
-class SessionCest
-{
-    use DiTrait;
-
-    /**
-     * @var array
-     */
-    protected $classes = [
-        'success' => 'successMessage',
-        'notice'  => 'noticeMessage',
-        'warning' => 'warningMessage',
-        'error'   => 'errorMessage',
-    ];
-
-    /**
-     * Executed before each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _before(UnitTester $I): void
-    {
-        $this->newDi();
-
-        try {
-            $this->setDiService('escaper');
-            $this->setDiService('sessionStream');
-        } catch (Exception $e) {
-            $I->fail($e->getMessage());
-        }
-
-        if (PHP_SESSION_ACTIVE !== session_status()) {
-            session_start();
-        }
-
-        if (!isset($_SESSION)) {
-            $_SESSION = [];
-        }
-    }
-
-    /**
-     * Executed after each test
-     *
-     * @param  UnitTester $I
-     * @return void
-     */
-    public function _after(UnitTester $I): void
-    {
-        session_destroy();
-    }
-
-
-    /**
-     * Tests auto escaping
-     *
-     * @param  UnitTester $I
-     * @param  Example $example
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @issue  https://github.com/phalcon/cphalcon/issues/11448
-     * @since  2016-06-15
-     *
-     * @dataProvider testShouldAutoEscapeHtmlProvider
-     */
-    public function testShouldAutoEscapeHtml(UnitTester $I, Example $example)
-    {
-        $function = $example[0];
-
-        $flash = $this->getFlash();
-
-
-        $flash->setAutoescape(false);
-
-        $message = "<script>alert('This will execute as JavaScript!')</script>";
-
-        $flash->$function($message);
-
-        $I->assertEquals(
-            [
-                $message,
-            ],
-            $flash->getMessages($function)
-        );
-
-
-        ob_start();
-        $flash->$function(
-            "<script>alert('This will execute as JavaScript!')</script>"
-        );
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            "<div class=\"{$function}Message\">" .
-            "<script>alert('This will execute as JavaScript!')</script></div>" . PHP_EOL,
-            $actual
-        );
-
-
-        $flash->setAutoescape(true);
-
-        $message = "<script>alert('This will execute as JavaScript!')</script>";
-
-        $flash->$function($message);
-
-        $I->assertEquals(
-            [
-                $message,
-            ],
-            $flash->getMessages($function)
-        );
-
-
-        ob_start();
-        $flash->$function(
-            "<script>alert('This will execute as JavaScript!')</script>"
-        );
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            "<div class=\"{$function}Message\">" .
-            "&lt;script&gt;alert(&#039;This will execute as JavaScript!" .
-            "&#039;)&lt;/script&gt;</div>" . PHP_EOL,
-            $actual
-        );
-    }
-
-    private function testShouldAutoEscapeHtmlProvider(): array
-    {
-        return [
-            ['error'],
-            ['success'],
-            ['notice'],
-            ['warning'],
-        ];
-    }
-
-    /**
-     * Return flash instance
-     */
-    protected function getFlash()
-    {
-        $container = $this->getDi();
-
-        $flash = new Session();
-        $flash->setDI($container);
-        $flash->setCssClasses($this->classes);
-
-        return $flash;
-    }
-
-    /**
-     * Test getMessages with specified type and removal
-     * activated, only removes the received messages.
-     *
-     * @param  UnitTester $I
-     *
-     * @author Iván Guillén <zeopix@gmail.com>
-     * @since  2015-10-26
-     */
-    public function testGetMessagesTypeRemoveMessages(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        $flash->success('sample success');
-        $flash->error('sample error');
-
-        $I->assertEquals(
-            [
-                'sample success',
-            ],
-            $flash->getMessages('success')
-        );
-
-        $I->assertEquals(
-            [
-                'sample error',
-            ],
-            $flash->getMessages('error')
-        );
-
-        $I->assertEmpty(
-            $flash->getMessages()
-        );
-    }
-
-    /**
-     * Tests getMessages in case of non existent type request
-     *
-     * @param  UnitTester $I
-     *
-     * @issue  https://github.com/phalcon/cphalcon/issues/11941
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2016-07-03
-     */
-    public function testGetNonExistentType(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        $flash->error('sample error');
-
-        $I->assertEquals(
-            [],
-            $flash->getMessages('success', false)
-        );
-
-        $I->assertCount(
-            1,
-            $flash->getMessages()
-        );
-    }
-
-    /**
-     * Tests clear method
-     *
-     * @param  UnitTester $I
-     *
-     * @author Iván Guillén <zeopix@gmail.com>
-     * @since  2015-10-26
-     */
-    public function testClearMessagesFormSession(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        ob_start();
-        $flash->output();
-        $flash->success('sample message');
-        $flash->clear();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            '',
-            $actual
-        );
-    }
-
-    /**
-     * Test output formatted messages
-     *
-     * @param  UnitTester $I
-     * @param  Example $example
-     *
-     * @author       Iván Guillén <zeopix@gmail.com>
-     * @since        2015-10-26
-     *
-     * @dataProvider testMessageFormatProvider
-     */
-    public function testMessageFormat(UnitTester $I, Example $example)
-    {
-        $function = $example[0];
-
-        $flash = $this->getFlash();
-
-        $class = sprintf(
-            ' class="%s"',
-            $this->classes[$function]
-        );
-
-        $message = 'sample message';
-
-        $expected = sprintf(
-            '<div%s>%s</div>' . PHP_EOL,
-            $class,
-            $message
-        );
-
-        ob_start();
-        $flash->$function($message);
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals($expected, $actual);
-    }
-
-    private function testMessageFormatProvider(): array
-    {
-        return [
-            ['error'],
-            ['success'],
-            ['notice'],
-        ];
-    }
-
-    /**
-     * Test custom message
-     *
-     * @param  UnitTester $I
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @issue  https://github.com/phalcon/cphalcon/issues/13445
-     * @since  2018-10-16
-     */
-    public function testCustomFormat(UnitTester $I)
-    {
-        $flash = $this->getFlash();
-
-        $template = '<span class="%cssClass%" aria-label="clickme">%message%</span>';
-
-        $flash->setCustomTemplate($template);
-
-        $message = 'sample message';
-
-        $flash->success($message);
-
-        ob_start();
-        $flash->output();
-        $actual = ob_get_contents();
-        ob_end_clean();
-
-        $I->assertEquals(
-            '<span class="successMessage" aria-label="clickme">sample message</span>',
-            $actual
-        );
-    }
-}
diff --git a/tests/unit/Forms/FormEntityCest.php b/tests/unit/Forms/FormEntityCest.php
index 668b6fb8e9e..b01d288b734 100644
--- a/tests/unit/Forms/FormEntityCest.php
+++ b/tests/unit/Forms/FormEntityCest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phalcon\Test\Unit\Forms;
+namespace Phalcon\Tests\Unit\Forms;
 
 use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Form;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Test\Models\Products;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Models\Products;
 use Phalcon\Validation;
 use Phalcon\Validation\Validator\StringLength\Max;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/BlackListCest.php b/tests/unit/Helper/Arr/BlackListCest.php
index c45f120f7ee..f19bb97cec1 100644
--- a/tests/unit/Helper/Arr/BlackListCest.php
+++ b/tests/unit/Helper/Arr/BlackListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use stdClass;
diff --git a/tests/unit/Helper/Arr/ChunkCest.php b/tests/unit/Helper/Arr/ChunkCest.php
index f198988d06c..8c47fc03cfe 100644
--- a/tests/unit/Helper/Arr/ChunkCest.php
+++ b/tests/unit/Helper/Arr/ChunkCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/FirstCest.php b/tests/unit/Helper/Arr/FirstCest.php
index e3ce8a35195..74b5e0a32cf 100644
--- a/tests/unit/Helper/Arr/FirstCest.php
+++ b/tests/unit/Helper/Arr/FirstCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/FirstKeyCest.php b/tests/unit/Helper/Arr/FirstKeyCest.php
index cb618c83329..6e90ab4a47d 100644
--- a/tests/unit/Helper/Arr/FirstKeyCest.php
+++ b/tests/unit/Helper/Arr/FirstKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/FlattenCest.php b/tests/unit/Helper/Arr/FlattenCest.php
index cac32a4e530..3ac6d18b83c 100644
--- a/tests/unit/Helper/Arr/FlattenCest.php
+++ b/tests/unit/Helper/Arr/FlattenCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/GetCest.php b/tests/unit/Helper/Arr/GetCest.php
index 75520c40f30..ada62531220 100644
--- a/tests/unit/Helper/Arr/GetCest.php
+++ b/tests/unit/Helper/Arr/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Codeception\Example;
 use Phalcon\Helper\Arr;
diff --git a/tests/unit/Helper/Arr/GroupCest.php b/tests/unit/Helper/Arr/GroupCest.php
index dd795c94c88..0ac9426dd8a 100644
--- a/tests/unit/Helper/Arr/GroupCest.php
+++ b/tests/unit/Helper/Arr/GroupCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use stdClass;
diff --git a/tests/unit/Helper/Arr/HasCest.php b/tests/unit/Helper/Arr/HasCest.php
index f097fe467bb..177c96a1c1c 100644
--- a/tests/unit/Helper/Arr/HasCest.php
+++ b/tests/unit/Helper/Arr/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/IsUniqueCest.php b/tests/unit/Helper/Arr/IsUniqueCest.php
index d2bbac0439c..f76de5df58b 100644
--- a/tests/unit/Helper/Arr/IsUniqueCest.php
+++ b/tests/unit/Helper/Arr/IsUniqueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/LastCest.php b/tests/unit/Helper/Arr/LastCest.php
index 8e1252f4899..ed887e3a5b9 100644
--- a/tests/unit/Helper/Arr/LastCest.php
+++ b/tests/unit/Helper/Arr/LastCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/LastKeyCest.php b/tests/unit/Helper/Arr/LastKeyCest.php
index 3ed84fefc54..0d234230e5e 100644
--- a/tests/unit/Helper/Arr/LastKeyCest.php
+++ b/tests/unit/Helper/Arr/LastKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/OrderCest.php b/tests/unit/Helper/Arr/OrderCest.php
index 97cbf6212dd..50b82470333 100644
--- a/tests/unit/Helper/Arr/OrderCest.php
+++ b/tests/unit/Helper/Arr/OrderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/PluckCest.php b/tests/unit/Helper/Arr/PluckCest.php
index 0c474696f08..42ac6dfd32b 100644
--- a/tests/unit/Helper/Arr/PluckCest.php
+++ b/tests/unit/Helper/Arr/PluckCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/SetCest.php b/tests/unit/Helper/Arr/SetCest.php
index 54e9d3188ba..bfdfca627f6 100644
--- a/tests/unit/Helper/Arr/SetCest.php
+++ b/tests/unit/Helper/Arr/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/SliceLeftCest.php b/tests/unit/Helper/Arr/SliceLeftCest.php
index 304a75e4562..e14cdc739b1 100644
--- a/tests/unit/Helper/Arr/SliceLeftCest.php
+++ b/tests/unit/Helper/Arr/SliceLeftCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/SliceRightCest.php b/tests/unit/Helper/Arr/SliceRightCest.php
index f7c60c395f9..64a5f4550ef 100644
--- a/tests/unit/Helper/Arr/SliceRightCest.php
+++ b/tests/unit/Helper/Arr/SliceRightCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/SplitCest.php b/tests/unit/Helper/Arr/SplitCest.php
index 560c21e6909..d935fd8f5b3 100644
--- a/tests/unit/Helper/Arr/SplitCest.php
+++ b/tests/unit/Helper/Arr/SplitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/ToObjectCest.php b/tests/unit/Helper/Arr/ToObjectCest.php
index 5a6c13c15a1..6568d17115f 100644
--- a/tests/unit/Helper/Arr/ToObjectCest.php
+++ b/tests/unit/Helper/Arr/ToObjectCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use stdClass;
diff --git a/tests/unit/Helper/Arr/ValidateAllCest.php b/tests/unit/Helper/Arr/ValidateAllCest.php
index 88c2eb78f57..f118440712e 100644
--- a/tests/unit/Helper/Arr/ValidateAllCest.php
+++ b/tests/unit/Helper/Arr/ValidateAllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/ValidateAnyCest.php b/tests/unit/Helper/Arr/ValidateAnyCest.php
index 204e490c9ad..39d67a134b9 100644
--- a/tests/unit/Helper/Arr/ValidateAnyCest.php
+++ b/tests/unit/Helper/Arr/ValidateAnyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use UnitTester;
diff --git a/tests/unit/Helper/Arr/WhiteListCest.php b/tests/unit/Helper/Arr/WhiteListCest.php
index 18395bae42f..f0a96b1fd36 100644
--- a/tests/unit/Helper/Arr/WhiteListCest.php
+++ b/tests/unit/Helper/Arr/WhiteListCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Arr;
+namespace Phalcon\Tests\Unit\Helper\Arr;
 
 use Phalcon\Helper\Arr;
 use stdClass;
diff --git a/tests/unit/Helper/Base64/DecodeUrlCest.php b/tests/unit/Helper/Base64/DecodeUrlCest.php
index eb70b04edc4..167777c9447 100644
--- a/tests/unit/Helper/Base64/DecodeUrlCest.php
+++ b/tests/unit/Helper/Base64/DecodeUrlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Base64;
+namespace Phalcon\Tests\Unit\Helper\Base64;
 
 use Phalcon\Helper\Base64;
 use UnitTester;
diff --git a/tests/unit/Helper/Base64/EncodeUrlCest.php b/tests/unit/Helper/Base64/EncodeUrlCest.php
index 0164bcc3aef..eedc36dd96e 100644
--- a/tests/unit/Helper/Base64/EncodeUrlCest.php
+++ b/tests/unit/Helper/Base64/EncodeUrlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Base64;
+namespace Phalcon\Tests\Unit\Helper\Base64;
 
 use Phalcon\Helper\Base64;
 use UnitTester;
diff --git a/tests/unit/Helper/Fs/FsBasenameCest.php b/tests/unit/Helper/Fs/FsBasenameCest.php
index a1937c4e61d..9d74ef1a1b7 100644
--- a/tests/unit/Helper/Fs/FsBasenameCest.php
+++ b/tests/unit/Helper/Fs/FsBasenameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Fs;
+namespace Phalcon\Tests\Unit\Helper\Fs;
 
 use Phalcon\Helper\Fs;
 use UnitTester;
diff --git a/tests/unit/Helper/Json/DecodeCest.php b/tests/unit/Helper/Json/DecodeCest.php
index 0dc0d3b1a98..50e762c13ca 100644
--- a/tests/unit/Helper/Json/DecodeCest.php
+++ b/tests/unit/Helper/Json/DecodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Json;
+namespace Phalcon\Tests\Unit\Helper\Json;
 
 use InvalidArgumentException;
 use Phalcon\Helper\Json;
diff --git a/tests/unit/Helper/Json/EncodeCest.php b/tests/unit/Helper/Json/EncodeCest.php
index aafc92053cc..164c77fc644 100644
--- a/tests/unit/Helper/Json/EncodeCest.php
+++ b/tests/unit/Helper/Json/EncodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Json;
+namespace Phalcon\Tests\Unit\Helper\Json;
 
 use InvalidArgumentException;
 use Phalcon\Helper\Json;
diff --git a/tests/unit/Helper/Number/BetweenCest.php b/tests/unit/Helper/Number/BetweenCest.php
index ca14387cee4..e8581a40560 100644
--- a/tests/unit/Helper/Number/BetweenCest.php
+++ b/tests/unit/Helper/Number/BetweenCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Number;
+namespace Phalcon\Tests\Unit\Helper\Number;
 
 use Phalcon\Helper\Number;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/CamelizeCest.php b/tests/unit/Helper/Str/CamelizeCest.php
index f3e6a4d3f1e..dd792fda314 100644
--- a/tests/unit/Helper/Str/CamelizeCest.php
+++ b/tests/unit/Helper/Str/CamelizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Helper/Str/ConcatCest.php b/tests/unit/Helper/Str/ConcatCest.php
index aeb83274eea..0ad8c128417 100644
--- a/tests/unit/Helper/Str/ConcatCest.php
+++ b/tests/unit/Helper/Str/ConcatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Exception;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Helper/Str/CountVowelsCest.php b/tests/unit/Helper/Str/CountVowelsCest.php
index cf9bc76635d..3e2152c307b 100644
--- a/tests/unit/Helper/Str/CountVowelsCest.php
+++ b/tests/unit/Helper/Str/CountVowelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/DecapitalizeCest.php b/tests/unit/Helper/Str/DecapitalizeCest.php
index 71976144f24..5a849513b55 100644
--- a/tests/unit/Helper/Str/DecapitalizeCest.php
+++ b/tests/unit/Helper/Str/DecapitalizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/DecrementCest.php b/tests/unit/Helper/Str/DecrementCest.php
index 0a83a60fb28..a4397188419 100644
--- a/tests/unit/Helper/Str/DecrementCest.php
+++ b/tests/unit/Helper/Str/DecrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Helper/Str/DirFromFileCest.php b/tests/unit/Helper/Str/DirFromFileCest.php
index 6ee37ab2235..0e6d394adf7 100644
--- a/tests/unit/Helper/Str/DirFromFileCest.php
+++ b/tests/unit/Helper/Str/DirFromFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/DirSeparatorCest.php b/tests/unit/Helper/Str/DirSeparatorCest.php
index 77c66ca3588..1edd2f762e7 100644
--- a/tests/unit/Helper/Str/DirSeparatorCest.php
+++ b/tests/unit/Helper/Str/DirSeparatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/DynamicCest.php b/tests/unit/Helper/Str/DynamicCest.php
index 05d41c5da61..cf3d3ae8558 100644
--- a/tests/unit/Helper/Str/DynamicCest.php
+++ b/tests/unit/Helper/Str/DynamicCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/EndsWithCest.php b/tests/unit/Helper/Str/EndsWithCest.php
index 9cd569870b8..e5df5602247 100644
--- a/tests/unit/Helper/Str/EndsWithCest.php
+++ b/tests/unit/Helper/Str/EndsWithCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/FirstBetweenCest.php b/tests/unit/Helper/Str/FirstBetweenCest.php
index 4efa863031c..3e70593af77 100644
--- a/tests/unit/Helper/Str/FirstBetweenCest.php
+++ b/tests/unit/Helper/Str/FirstBetweenCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/FriendlyCest.php b/tests/unit/Helper/Str/FriendlyCest.php
index a3c1950df10..28e98e57476 100644
--- a/tests/unit/Helper/Str/FriendlyCest.php
+++ b/tests/unit/Helper/Str/FriendlyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Exception;
diff --git a/tests/unit/Helper/Str/HumanizeCest.php b/tests/unit/Helper/Str/HumanizeCest.php
index fbc8d9b4d37..0c41c1fd10f 100644
--- a/tests/unit/Helper/Str/HumanizeCest.php
+++ b/tests/unit/Helper/Str/HumanizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/IncludesCest.php b/tests/unit/Helper/Str/IncludesCest.php
index d523324dd19..8d464c22872 100644
--- a/tests/unit/Helper/Str/IncludesCest.php
+++ b/tests/unit/Helper/Str/IncludesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/IncrementCest.php b/tests/unit/Helper/Str/IncrementCest.php
index fa6c91c0420..a65ef1ced4f 100644
--- a/tests/unit/Helper/Str/IncrementCest.php
+++ b/tests/unit/Helper/Str/IncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Helper/Str/IsAnagramCest.php b/tests/unit/Helper/Str/IsAnagramCest.php
index 190d5915884..ab331c6bbfb 100644
--- a/tests/unit/Helper/Str/IsAnagramCest.php
+++ b/tests/unit/Helper/Str/IsAnagramCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/IsLowerCest.php b/tests/unit/Helper/Str/IsLowerCest.php
index e5fdef4a8b7..b5c28d9ed15 100644
--- a/tests/unit/Helper/Str/IsLowerCest.php
+++ b/tests/unit/Helper/Str/IsLowerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/IsPalindromeCest.php b/tests/unit/Helper/Str/IsPalindromeCest.php
index feec586d93d..1478b7779bc 100644
--- a/tests/unit/Helper/Str/IsPalindromeCest.php
+++ b/tests/unit/Helper/Str/IsPalindromeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/IsUpperCest.php b/tests/unit/Helper/Str/IsUpperCest.php
index f82ab5ff79a..a5a84528aaa 100644
--- a/tests/unit/Helper/Str/IsUpperCest.php
+++ b/tests/unit/Helper/Str/IsUpperCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/LowerCest.php b/tests/unit/Helper/Str/LowerCest.php
index 5b7adf17e97..312d452603d 100644
--- a/tests/unit/Helper/Str/LowerCest.php
+++ b/tests/unit/Helper/Str/LowerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/RandomCest.php b/tests/unit/Helper/Str/RandomCest.php
index 47e972971e1..f3e3c0be202 100644
--- a/tests/unit/Helper/Str/RandomCest.php
+++ b/tests/unit/Helper/Str/RandomCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Helper/Str/ReduceSlashesCest.php b/tests/unit/Helper/Str/ReduceSlashesCest.php
index 9b20e8e13da..49eeaf8fa8e 100644
--- a/tests/unit/Helper/Str/ReduceSlashesCest.php
+++ b/tests/unit/Helper/Str/ReduceSlashesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/StartsWithCest.php b/tests/unit/Helper/Str/StartsWithCest.php
index 9224d888a78..1499c738265 100644
--- a/tests/unit/Helper/Str/StartsWithCest.php
+++ b/tests/unit/Helper/Str/StartsWithCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/UncamelizeCest.php b/tests/unit/Helper/Str/UncamelizeCest.php
index d4d01a04b4e..c1e7c91a85d 100644
--- a/tests/unit/Helper/Str/UncamelizeCest.php
+++ b/tests/unit/Helper/Str/UncamelizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Helper/Str/UnderscoreCest.php b/tests/unit/Helper/Str/UnderscoreCest.php
index bb617b51f38..d065d958ccf 100644
--- a/tests/unit/Helper/Str/UnderscoreCest.php
+++ b/tests/unit/Helper/Str/UnderscoreCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Phalcon\Helper\Str;
 use UnitTester;
diff --git a/tests/unit/Helper/Str/UpperCest.php b/tests/unit/Helper/Str/UpperCest.php
index 62c8002b6d0..e19cc4b224c 100644
--- a/tests/unit/Helper/Str/UpperCest.php
+++ b/tests/unit/Helper/Str/UpperCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Helper\Str;
+namespace Phalcon\Tests\Unit\Helper\Str;
 
 use Codeception\Example;
 use Phalcon\Helper\Str;
diff --git a/tests/unit/Html/Attributes/ClearCest.php b/tests/unit/Html/Attributes/ClearCest.php
index 1ba265ba739..0961787ae72 100644
--- a/tests/unit/Html/Attributes/ClearCest.php
+++ b/tests/unit/Html/Attributes/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/ConstructCest.php b/tests/unit/Html/Attributes/ConstructCest.php
index 97ec6a0b29f..823aa2aee17 100644
--- a/tests/unit/Html/Attributes/ConstructCest.php
+++ b/tests/unit/Html/Attributes/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Collection;
 use Phalcon\Html\Attributes;
diff --git a/tests/unit/Html/Attributes/CountCest.php b/tests/unit/Html/Attributes/CountCest.php
index ac3248ee92e..9b8b6aaf345 100644
--- a/tests/unit/Html/Attributes/CountCest.php
+++ b/tests/unit/Html/Attributes/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/GetCest.php b/tests/unit/Html/Attributes/GetCest.php
index 490cff6faf4..3284610e297 100644
--- a/tests/unit/Html/Attributes/GetCest.php
+++ b/tests/unit/Html/Attributes/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/GetIteratorCest.php b/tests/unit/Html/Attributes/GetIteratorCest.php
index 194a12c3a74..958094f8094 100644
--- a/tests/unit/Html/Attributes/GetIteratorCest.php
+++ b/tests/unit/Html/Attributes/GetIteratorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/HasCest.php b/tests/unit/Html/Attributes/HasCest.php
index 29b2b103fd2..54d113e9465 100644
--- a/tests/unit/Html/Attributes/HasCest.php
+++ b/tests/unit/Html/Attributes/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/InitCest.php b/tests/unit/Html/Attributes/InitCest.php
index cb8b9442578..320cb2db40b 100644
--- a/tests/unit/Html/Attributes/InitCest.php
+++ b/tests/unit/Html/Attributes/InitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/JsonSerializeCest.php b/tests/unit/Html/Attributes/JsonSerializeCest.php
index deb6bc1e9bb..0f61faad7cb 100644
--- a/tests/unit/Html/Attributes/JsonSerializeCest.php
+++ b/tests/unit/Html/Attributes/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/OffsetExistsCest.php b/tests/unit/Html/Attributes/OffsetExistsCest.php
index e2adf67df24..b08cd689f7f 100644
--- a/tests/unit/Html/Attributes/OffsetExistsCest.php
+++ b/tests/unit/Html/Attributes/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/OffsetGetCest.php b/tests/unit/Html/Attributes/OffsetGetCest.php
index 2a0fe12b852..8c0909f722a 100644
--- a/tests/unit/Html/Attributes/OffsetGetCest.php
+++ b/tests/unit/Html/Attributes/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/OffsetSetCest.php b/tests/unit/Html/Attributes/OffsetSetCest.php
index 9ba978cec62..3872d11f5ec 100644
--- a/tests/unit/Html/Attributes/OffsetSetCest.php
+++ b/tests/unit/Html/Attributes/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/OffsetUnsetCest.php b/tests/unit/Html/Attributes/OffsetUnsetCest.php
index b21f2b935c7..0064b10daec 100644
--- a/tests/unit/Html/Attributes/OffsetUnsetCest.php
+++ b/tests/unit/Html/Attributes/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/RemoveCest.php b/tests/unit/Html/Attributes/RemoveCest.php
index e76ad2e835f..e53f13fea7e 100644
--- a/tests/unit/Html/Attributes/RemoveCest.php
+++ b/tests/unit/Html/Attributes/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/RenderCest.php b/tests/unit/Html/Attributes/RenderCest.php
index f8fdc3044e0..5b14715cf64 100644
--- a/tests/unit/Html/Attributes/RenderCest.php
+++ b/tests/unit/Html/Attributes/RenderCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class RenderCest
diff --git a/tests/unit/Html/Attributes/SerializeCest.php b/tests/unit/Html/Attributes/SerializeCest.php
index 2330a617f2b..30f9d38153d 100644
--- a/tests/unit/Html/Attributes/SerializeCest.php
+++ b/tests/unit/Html/Attributes/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/SetCest.php b/tests/unit/Html/Attributes/SetCest.php
index 74dcf96c7fc..f8e7682a821 100644
--- a/tests/unit/Html/Attributes/SetCest.php
+++ b/tests/unit/Html/Attributes/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/ToArrayCest.php b/tests/unit/Html/Attributes/ToArrayCest.php
index e8f9deb907f..57cd1460ad1 100644
--- a/tests/unit/Html/Attributes/ToArrayCest.php
+++ b/tests/unit/Html/Attributes/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/ToJsonCest.php b/tests/unit/Html/Attributes/ToJsonCest.php
index c13d0978704..09ae536389e 100644
--- a/tests/unit/Html/Attributes/ToJsonCest.php
+++ b/tests/unit/Html/Attributes/ToJsonCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/ToStringCest.php b/tests/unit/Html/Attributes/ToStringCest.php
index 8a5d0bc75dd..b1775d182a7 100644
--- a/tests/unit/Html/Attributes/ToStringCest.php
+++ b/tests/unit/Html/Attributes/ToStringCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class ToStringCest
diff --git a/tests/unit/Html/Attributes/UnderscoreGetCest.php b/tests/unit/Html/Attributes/UnderscoreGetCest.php
index 1d8b182ca93..131aa583487 100644
--- a/tests/unit/Html/Attributes/UnderscoreGetCest.php
+++ b/tests/unit/Html/Attributes/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/UnderscoreIsSetCest.php b/tests/unit/Html/Attributes/UnderscoreIsSetCest.php
index 32268732127..eda6e7292d8 100644
--- a/tests/unit/Html/Attributes/UnderscoreIsSetCest.php
+++ b/tests/unit/Html/Attributes/UnderscoreIsSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/UnderscoreSetCest.php b/tests/unit/Html/Attributes/UnderscoreSetCest.php
index b92a2bec0e6..6071295bba2 100644
--- a/tests/unit/Html/Attributes/UnderscoreSetCest.php
+++ b/tests/unit/Html/Attributes/UnderscoreSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/UnderscoreUnsetCest.php b/tests/unit/Html/Attributes/UnderscoreUnsetCest.php
index 6bde7410fbc..8628c27e38d 100644
--- a/tests/unit/Html/Attributes/UnderscoreUnsetCest.php
+++ b/tests/unit/Html/Attributes/UnderscoreUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Attributes/UnserializeCest.php b/tests/unit/Html/Attributes/UnserializeCest.php
index 351b9660648..5183db52b3f 100644
--- a/tests/unit/Html/Attributes/UnserializeCest.php
+++ b/tests/unit/Html/Attributes/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Attributes;
+namespace Phalcon\Tests\Unit\Html\Attributes;
 
 use Phalcon\Html\Attributes;
 use UnitTester;
diff --git a/tests/unit/Html/Breadcrumbs/AddCest.php b/tests/unit/Html/Breadcrumbs/AddCest.php
index c545e411b90..31fb991f60b 100644
--- a/tests/unit/Html/Breadcrumbs/AddCest.php
+++ b/tests/unit/Html/Breadcrumbs/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Breadcrumbs;
+namespace Phalcon\Tests\Unit\Html\Breadcrumbs;
 
 use Phalcon\Html\Breadcrumbs;
 use UnitTester;
diff --git a/tests/unit/Html/Breadcrumbs/ClearCest.php b/tests/unit/Html/Breadcrumbs/ClearCest.php
index af912ac79df..f59e9b58523 100644
--- a/tests/unit/Html/Breadcrumbs/ClearCest.php
+++ b/tests/unit/Html/Breadcrumbs/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Breadcrumbs;
+namespace Phalcon\Tests\Unit\Html\Breadcrumbs;
 
 use Phalcon\Html\Breadcrumbs;
 use UnitTester;
diff --git a/tests/unit/Html/Breadcrumbs/GetSetSeparatorCest.php b/tests/unit/Html/Breadcrumbs/GetSetSeparatorCest.php
index c9f300c2c70..60d82c03203 100644
--- a/tests/unit/Html/Breadcrumbs/GetSetSeparatorCest.php
+++ b/tests/unit/Html/Breadcrumbs/GetSetSeparatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Breadcrumbs;
+namespace Phalcon\Tests\Unit\Html\Breadcrumbs;
 
 use Phalcon\Html\Breadcrumbs;
 use UnitTester;
diff --git a/tests/unit/Html/Breadcrumbs/RemoveCest.php b/tests/unit/Html/Breadcrumbs/RemoveCest.php
index b58773ada93..a1e3a92e34f 100644
--- a/tests/unit/Html/Breadcrumbs/RemoveCest.php
+++ b/tests/unit/Html/Breadcrumbs/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Breadcrumbs;
+namespace Phalcon\Tests\Unit\Html\Breadcrumbs;
 
 use Phalcon\Html\Breadcrumbs;
 use UnitTester;
diff --git a/tests/unit/Html/Breadcrumbs/RenderCest.php b/tests/unit/Html/Breadcrumbs/RenderCest.php
index 74d4965043d..0d55664424c 100644
--- a/tests/unit/Html/Breadcrumbs/RenderCest.php
+++ b/tests/unit/Html/Breadcrumbs/RenderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Breadcrumbs;
+namespace Phalcon\Tests\Unit\Html\Breadcrumbs;
 
 use Phalcon\Html\Breadcrumbs;
 use UnitTester;
diff --git a/tests/unit/Html/Breadcrumbs/ToArrayCest.php b/tests/unit/Html/Breadcrumbs/ToArrayCest.php
index ef3aaa55fea..e063e637b43 100644
--- a/tests/unit/Html/Breadcrumbs/ToArrayCest.php
+++ b/tests/unit/Html/Breadcrumbs/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Breadcrumbs;
+namespace Phalcon\Tests\Unit\Html\Breadcrumbs;
 
 use Phalcon\Html\Breadcrumbs;
 use UnitTester;
diff --git a/tests/unit/Html/Helper/Anchor/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Anchor/UnderscoreInvokeCest.php
index 3e18cbc5d36..9fcedbb5620 100644
--- a/tests/unit/Html/Helper/Anchor/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Anchor/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Anchor;
+namespace Phalcon\Tests\Unit\Html\Helper\Anchor;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Base/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Base/UnderscoreInvokeCest.php
index aafae6efb03..aa65612d676 100644
--- a/tests/unit/Html/Helper/Base/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Base/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Base;
+namespace Phalcon\Tests\Unit\Html\Helper\Base;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Body/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Body/UnderscoreInvokeCest.php
index 4223017c577..20b9aa41c62 100644
--- a/tests/unit/Html/Helper/Body/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Body/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Body;
+namespace Phalcon\Tests\Unit\Html\Helper\Body;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Button/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Button/UnderscoreInvokeCest.php
index 67ac229d847..26d86087920 100644
--- a/tests/unit/Html/Helper/Button/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Button/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Button;
+namespace Phalcon\Tests\Unit\Html\Helper\Button;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Close/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Close/UnderscoreInvokeCest.php
index 8efdb963184..ebffffdaec3 100644
--- a/tests/unit/Html/Helper/Close/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Close/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Close;
+namespace Phalcon\Tests\Unit\Html\Helper\Close;
 
 use Phalcon\Escaper;
 use Phalcon\Factory\Exception;
diff --git a/tests/unit/Html/Helper/Element/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Element/UnderscoreInvokeCest.php
index efca45d50c4..4460fabc1a9 100644
--- a/tests/unit/Html/Helper/Element/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Element/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Element;
+namespace Phalcon\Tests\Unit\Html\Helper\Element;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Form/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Form/UnderscoreInvokeCest.php
index d7ecee8b3fd..92d98d6e639 100644
--- a/tests/unit/Html/Helper/Form/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Form/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Form;
+namespace Phalcon\Tests\Unit\Html\Helper\Form;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Img/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Img/UnderscoreInvokeCest.php
index 9ffa7ab2251..825c456a79c 100644
--- a/tests/unit/Html/Helper/Img/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Img/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Img;
+namespace Phalcon\Tests\Unit\Html\Helper\Img;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php b/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php
index 2bd9e353bc2..1edc492d9ea 100644
--- a/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Input;
+namespace Phalcon\Tests\Unit\Html\Helper\Input;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php b/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php
index d2cef059c8b..1310ff19254 100644
--- a/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Input;
+namespace Phalcon\Tests\Unit\Html\Helper\Input;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php
index e05f3331f30..47d981b669e 100644
--- a/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Input;
+namespace Phalcon\Tests\Unit\Html\Helper\Input;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php
index 076d928a5f1..07de56ce0e1 100644
--- a/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Label;
+namespace Phalcon\Tests\Unit\Html\Helper\Label;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Link/ToStringCest.php b/tests/unit/Html/Helper/Link/ToStringCest.php
index cccaa0b9f9e..bc5185d5d66 100644
--- a/tests/unit/Html/Helper/Link/ToStringCest.php
+++ b/tests/unit/Html/Helper/Link/ToStringCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Link;
+namespace Phalcon\Tests\Unit\Html\Helper\Link;
 
 use Phalcon\Escaper;
 use Phalcon\Html\Helper\Link;
diff --git a/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php
index 3e740a66f7e..4b55fe0178b 100644
--- a/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Link;
+namespace Phalcon\Tests\Unit\Html\Helper\Link;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Meta/ToStringCest.php b/tests/unit/Html/Helper/Meta/ToStringCest.php
index 38230b10fd6..c145fe6439a 100644
--- a/tests/unit/Html/Helper/Meta/ToStringCest.php
+++ b/tests/unit/Html/Helper/Meta/ToStringCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Meta;
+namespace Phalcon\Tests\Unit\Html\Helper\Meta;
 
 use Phalcon\Escaper;
 use Phalcon\Html\Helper\Meta;
diff --git a/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php
index 2025f6537e4..b9058e6530c 100644
--- a/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Meta;
+namespace Phalcon\Tests\Unit\Html\Helper\Meta;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Ol/ToStringCest.php b/tests/unit/Html/Helper/Ol/ToStringCest.php
index 4f5238fb8bf..44caf235246 100644
--- a/tests/unit/Html/Helper/Ol/ToStringCest.php
+++ b/tests/unit/Html/Helper/Ol/ToStringCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Ol;
+namespace Phalcon\Tests\Unit\Html\Helper\Ol;
 
 use Phalcon\Escaper;
 use Phalcon\Html\Helper\Ol;
diff --git a/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php
index 03883f31a8b..9c1cbccbfe7 100644
--- a/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Ol;
+namespace Phalcon\Tests\Unit\Html\Helper\Ol;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Script/ToStringCest.php b/tests/unit/Html/Helper/Script/ToStringCest.php
index 0d8f15e9f16..d3992bc7bee 100644
--- a/tests/unit/Html/Helper/Script/ToStringCest.php
+++ b/tests/unit/Html/Helper/Script/ToStringCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Script;
+namespace Phalcon\Tests\Unit\Html\Helper\Script;
 
 use Phalcon\Escaper;
 use Phalcon\Html\Helper\Script;
diff --git a/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php
index 248e7541fa2..d4be8279289 100644
--- a/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Script;
+namespace Phalcon\Tests\Unit\Html\Helper\Script;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Style/ToStringCest.php b/tests/unit/Html/Helper/Style/ToStringCest.php
index e758d0571b3..e4561418768 100644
--- a/tests/unit/Html/Helper/Style/ToStringCest.php
+++ b/tests/unit/Html/Helper/Style/ToStringCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Style;
+namespace Phalcon\Tests\Unit\Html\Helper\Style;
 
 use Phalcon\Escaper;
 use Phalcon\Html\Helper\Style;
diff --git a/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php
index 3b78e3700ce..bbb46230408 100644
--- a/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Style;
+namespace Phalcon\Tests\Unit\Html\Helper\Style;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
index 419394ce8e8..29f487f7bef 100644
--- a/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Title;
+namespace Phalcon\Tests\Unit\Html\Helper\Title;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php
index 94f561c5a34..ae93e22d9fb 100644
--- a/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Helper\Ul;
+namespace Phalcon\Tests\Unit\Html\Helper\Ul;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Html/Link/EvolvableLink/ConstructCest.php b/tests/unit/Html/Link/EvolvableLink/ConstructCest.php
index 50a52f4a574..13a7bd3900b 100644
--- a/tests/unit/Html/Link/EvolvableLink/ConstructCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use Psr\Link\EvolvableLinkInterface;
diff --git a/tests/unit/Html/Link/EvolvableLink/GetAttributesCest.php b/tests/unit/Html/Link/EvolvableLink/GetAttributesCest.php
index 4664a74a2de..50592804482 100644
--- a/tests/unit/Html/Link/EvolvableLink/GetAttributesCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/GetHrefCest.php b/tests/unit/Html/Link/EvolvableLink/GetHrefCest.php
index 0a19deed1a2..1133415c3f2 100644
--- a/tests/unit/Html/Link/EvolvableLink/GetHrefCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/GetHrefCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/GetRelsCest.php b/tests/unit/Html/Link/EvolvableLink/GetRelsCest.php
index c08c67a2d6b..048e8f3a34a 100644
--- a/tests/unit/Html/Link/EvolvableLink/GetRelsCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/GetRelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/IsTemplatedCest.php b/tests/unit/Html/Link/EvolvableLink/IsTemplatedCest.php
index 1fe17f9bf22..3a0bf687509 100644
--- a/tests/unit/Html/Link/EvolvableLink/IsTemplatedCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/IsTemplatedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/WithAttributeCest.php b/tests/unit/Html/Link/EvolvableLink/WithAttributeCest.php
index b8f2cad543c..70f770eb7f0 100644
--- a/tests/unit/Html/Link/EvolvableLink/WithAttributeCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/WithAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/WithHrefCest.php b/tests/unit/Html/Link/EvolvableLink/WithHrefCest.php
index 819320f8b1e..3b37971b677 100644
--- a/tests/unit/Html/Link/EvolvableLink/WithHrefCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/WithHrefCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/WithRelCest.php b/tests/unit/Html/Link/EvolvableLink/WithRelCest.php
index ff1ecac6e32..38607a2cc46 100644
--- a/tests/unit/Html/Link/EvolvableLink/WithRelCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/WithRelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/WithoutAttributeCest.php b/tests/unit/Html/Link/EvolvableLink/WithoutAttributeCest.php
index e27519d9551..92898d55044 100644
--- a/tests/unit/Html/Link/EvolvableLink/WithoutAttributeCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/WithoutAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLink/WithoutRelCest.php b/tests/unit/Html/Link/EvolvableLink/WithoutRelCest.php
index 770f669086c..70c385c4c3e 100644
--- a/tests/unit/Html/Link/EvolvableLink/WithoutRelCest.php
+++ b/tests/unit/Html/Link/EvolvableLink/WithoutRelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLink;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLink;
 
 use Phalcon\Html\Link\EvolvableLink;
 use UnitTester;
diff --git a/tests/unit/Html/Link/EvolvableLinkProvider/ConstructCest.php b/tests/unit/Html/Link/EvolvableLinkProvider/ConstructCest.php
index 8c2a2b7c036..408e7452553 100644
--- a/tests/unit/Html/Link/EvolvableLinkProvider/ConstructCest.php
+++ b/tests/unit/Html/Link/EvolvableLinkProvider/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLinkProvider;
 
 use Phalcon\Html\Link\EvolvableLinkProvider;
 use Psr\Link\EvolvableLinkProviderInterface;
diff --git a/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksByRelCest.php b/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksByRelCest.php
index 239287ba73c..dc51802186c 100644
--- a/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksByRelCest.php
+++ b/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksByRelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLinkProvider;
 
 use Phalcon\Html\Link\EvolvableLinkProvider;
 use Phalcon\Html\Link\Link;
diff --git a/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksCest.php b/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksCest.php
index e104c57970a..bdcb9887f4b 100644
--- a/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksCest.php
+++ b/tests/unit/Html/Link/EvolvableLinkProvider/GetLinksCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLinkProvider;
 
 use Phalcon\Html\Link\EvolvableLinkProvider;
 use Phalcon\Html\Link\Link;
diff --git a/tests/unit/Html/Link/EvolvableLinkProvider/WithLinkCest.php b/tests/unit/Html/Link/EvolvableLinkProvider/WithLinkCest.php
index a1421bbb54e..fa296fe7820 100644
--- a/tests/unit/Html/Link/EvolvableLinkProvider/WithLinkCest.php
+++ b/tests/unit/Html/Link/EvolvableLinkProvider/WithLinkCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLinkProvider;
 
 use Phalcon\Html\Link\EvolvableLinkProvider;
 use Phalcon\Html\Link\Link;
diff --git a/tests/unit/Html/Link/EvolvableLinkProvider/WithoutLinkCest.php b/tests/unit/Html/Link/EvolvableLinkProvider/WithoutLinkCest.php
index e4e53f4be76..4b7dea491e0 100644
--- a/tests/unit/Html/Link/EvolvableLinkProvider/WithoutLinkCest.php
+++ b/tests/unit/Html/Link/EvolvableLinkProvider/WithoutLinkCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\EvolvableLinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\EvolvableLinkProvider;
 
 use Phalcon\Html\Link\EvolvableLinkProvider;
 use Phalcon\Html\Link\Link;
diff --git a/tests/unit/Html/Link/Link/ConstructCest.php b/tests/unit/Html/Link/Link/ConstructCest.php
index d28729d32ce..328d78674c2 100644
--- a/tests/unit/Html/Link/Link/ConstructCest.php
+++ b/tests/unit/Html/Link/Link/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Link;
+namespace Phalcon\Tests\Unit\Html\Link\Link;
 
 use Phalcon\Html\Link\Link;
 use Psr\Link\LinkInterface;
diff --git a/tests/unit/Html/Link/Link/GetAttributesCest.php b/tests/unit/Html/Link/Link/GetAttributesCest.php
index f4cf8c2ea66..2152df9470f 100644
--- a/tests/unit/Html/Link/Link/GetAttributesCest.php
+++ b/tests/unit/Html/Link/Link/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Link;
+namespace Phalcon\Tests\Unit\Html\Link\Link;
 
 use Phalcon\Html\Link\Link;
 use UnitTester;
diff --git a/tests/unit/Html/Link/Link/GetHrefCest.php b/tests/unit/Html/Link/Link/GetHrefCest.php
index 516e0f3c0dc..ee6b570fc57 100644
--- a/tests/unit/Html/Link/Link/GetHrefCest.php
+++ b/tests/unit/Html/Link/Link/GetHrefCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Link;
+namespace Phalcon\Tests\Unit\Html\Link\Link;
 
 use Phalcon\Html\Link\Link;
 use UnitTester;
diff --git a/tests/unit/Html/Link/Link/GetRelsCest.php b/tests/unit/Html/Link/Link/GetRelsCest.php
index 1829da55d89..72b712b8cf8 100644
--- a/tests/unit/Html/Link/Link/GetRelsCest.php
+++ b/tests/unit/Html/Link/Link/GetRelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Link;
+namespace Phalcon\Tests\Unit\Html\Link\Link;
 
 use Phalcon\Html\Link\Link;
 use UnitTester;
diff --git a/tests/unit/Html/Link/Link/IsTemplatedCest.php b/tests/unit/Html/Link/Link/IsTemplatedCest.php
index b7df8baee40..7437413c8b6 100644
--- a/tests/unit/Html/Link/Link/IsTemplatedCest.php
+++ b/tests/unit/Html/Link/Link/IsTemplatedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Link;
+namespace Phalcon\Tests\Unit\Html\Link\Link;
 
 use Phalcon\Html\Link\Link;
 use UnitTester;
diff --git a/tests/unit/Html/Link/LinkProvider/ConstructCest.php b/tests/unit/Html/Link/LinkProvider/ConstructCest.php
index 35e19888131..83111568c76 100644
--- a/tests/unit/Html/Link/LinkProvider/ConstructCest.php
+++ b/tests/unit/Html/Link/LinkProvider/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\LinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\LinkProvider;
 
 use Phalcon\Html\Link\Link;
 use Phalcon\Html\Link\LinkProvider;
diff --git a/tests/unit/Html/Link/LinkProvider/GetLinksByRelCest.php b/tests/unit/Html/Link/LinkProvider/GetLinksByRelCest.php
index 6fecd3419ab..2b2bfa0fe03 100644
--- a/tests/unit/Html/Link/LinkProvider/GetLinksByRelCest.php
+++ b/tests/unit/Html/Link/LinkProvider/GetLinksByRelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\LinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\LinkProvider;
 
 use Phalcon\Html\Link\Link;
 use Phalcon\Html\Link\LinkProvider;
diff --git a/tests/unit/Html/Link/LinkProvider/GetLinksCest.php b/tests/unit/Html/Link/LinkProvider/GetLinksCest.php
index baa9660e247..19cb5ee0188 100644
--- a/tests/unit/Html/Link/LinkProvider/GetLinksCest.php
+++ b/tests/unit/Html/Link/LinkProvider/GetLinksCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\LinkProvider;
+namespace Phalcon\Tests\Unit\Html\Link\LinkProvider;
 
 use Phalcon\Html\Link\Link;
 use Phalcon\Html\Link\LinkProvider;
diff --git a/tests/unit/Html/Link/Serializer/Header/ConstructCest.php b/tests/unit/Html/Link/Serializer/Header/ConstructCest.php
index 2f20f59aa29..8cbc703d5bd 100644
--- a/tests/unit/Html/Link/Serializer/Header/ConstructCest.php
+++ b/tests/unit/Html/Link/Serializer/Header/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Serializer\Header;
+namespace Phalcon\Tests\Unit\Html\Link\Serializer\Header;
 
 use Phalcon\Html\Link\Serializer\Header;
 use Phalcon\Html\Link\Serializer\SerializerInterface;
diff --git a/tests/unit/Html/Link/Serializer/Header/SerializeCest.php b/tests/unit/Html/Link/Serializer/Header/SerializeCest.php
index b47f4b4396e..05d6e7e8c7a 100644
--- a/tests/unit/Html/Link/Serializer/Header/SerializeCest.php
+++ b/tests/unit/Html/Link/Serializer/Header/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\Link\Serializer\Header;
+namespace Phalcon\Tests\Unit\Html\Link\Serializer\Header;
 
 use Phalcon\Html\Link\EvolvableLink;
 use Phalcon\Html\Link\Serializer\Header;
diff --git a/tests/unit/Html/TagFactory/NewInstanceCest.php b/tests/unit/Html/TagFactory/NewInstanceCest.php
index 3223014281c..469f09149f3 100644
--- a/tests/unit/Html/TagFactory/NewInstanceCest.php
+++ b/tests/unit/Html/TagFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Html\TagFactory;
+namespace Phalcon\Tests\Unit\Html\TagFactory;
 
 use Codeception\Example;
 use Phalcon\Escaper;
diff --git a/tests/unit/Http/Cookie/ConstructCest.php b/tests/unit/Http/Cookie/ConstructCest.php
index d46cfa01f6d..6d81387bc86 100644
--- a/tests/unit/Http/Cookie/ConstructCest.php
+++ b/tests/unit/Http/Cookie/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Http/Cookie/CookieCest.php b/tests/unit/Http/Cookie/CookieCest.php
index 043260a4c61..663bfa63607 100644
--- a/tests/unit/Http/Cookie/CookieCest.php
+++ b/tests/unit/Http/Cookie/CookieCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
 use Phalcon\Http\Cookie\Exception;
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 use function explode;
diff --git a/tests/unit/Http/Cookie/DeleteCest.php b/tests/unit/Http/Cookie/DeleteCest.php
index e0d5855bb91..77429f6f2d6 100644
--- a/tests/unit/Http/Cookie/DeleteCest.php
+++ b/tests/unit/Http/Cookie/DeleteCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
 use UnitTester;
diff --git a/tests/unit/Http/Cookie/GetNameCest.php b/tests/unit/Http/Cookie/GetNameCest.php
index 22a0eade760..002dfdbe851 100644
--- a/tests/unit/Http/Cookie/GetNameCest.php
+++ b/tests/unit/Http/Cookie/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
 use UnitTester;
diff --git a/tests/unit/Http/Cookie/GetSetDICest.php b/tests/unit/Http/Cookie/GetSetDICest.php
index e414d252fb7..ac32699941d 100644
--- a/tests/unit/Http/Cookie/GetSetDICest.php
+++ b/tests/unit/Http/Cookie/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Di;
 use Phalcon\Http\Cookie;
diff --git a/tests/unit/Http/Cookie/GetSetDomainCest.php b/tests/unit/Http/Cookie/GetSetDomainCest.php
index 7156b810755..62c64e3b1d9 100644
--- a/tests/unit/Http/Cookie/GetSetDomainCest.php
+++ b/tests/unit/Http/Cookie/GetSetDomainCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetDomainCest
diff --git a/tests/unit/Http/Cookie/GetSetExpirationCest.php b/tests/unit/Http/Cookie/GetSetExpirationCest.php
index 93a295f6868..efc9b2ac965 100644
--- a/tests/unit/Http/Cookie/GetSetExpirationCest.php
+++ b/tests/unit/Http/Cookie/GetSetExpirationCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetExpirationCest
diff --git a/tests/unit/Http/Cookie/GetSetHttpOnlyCest.php b/tests/unit/Http/Cookie/GetSetHttpOnlyCest.php
index 342fd8f825a..b6b0714b8c6 100644
--- a/tests/unit/Http/Cookie/GetSetHttpOnlyCest.php
+++ b/tests/unit/Http/Cookie/GetSetHttpOnlyCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetHttpOnlyCest
diff --git a/tests/unit/Http/Cookie/GetSetPathCest.php b/tests/unit/Http/Cookie/GetSetPathCest.php
index dd2dd89b1fe..4911b8985a5 100644
--- a/tests/unit/Http/Cookie/GetSetPathCest.php
+++ b/tests/unit/Http/Cookie/GetSetPathCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetPathCest
diff --git a/tests/unit/Http/Cookie/GetSetSecureCest.php b/tests/unit/Http/Cookie/GetSetSecureCest.php
index 4789b90a980..dc8297dfd02 100644
--- a/tests/unit/Http/Cookie/GetSetSecureCest.php
+++ b/tests/unit/Http/Cookie/GetSetSecureCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetSecureCest
diff --git a/tests/unit/Http/Cookie/GetSetValueCest.php b/tests/unit/Http/Cookie/GetSetValueCest.php
index e904d8fe4d3..ed2b9bf1223 100644
--- a/tests/unit/Http/Cookie/GetSetValueCest.php
+++ b/tests/unit/Http/Cookie/GetSetValueCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetValueCest
diff --git a/tests/unit/Http/Cookie/RestoreCest.php b/tests/unit/Http/Cookie/RestoreCest.php
index 6a18d9ea865..eb3ac04ec0a 100644
--- a/tests/unit/Http/Cookie/RestoreCest.php
+++ b/tests/unit/Http/Cookie/RestoreCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class RestoreCest
diff --git a/tests/unit/Http/Cookie/SendCest.php b/tests/unit/Http/Cookie/SendCest.php
index 49b64e3a27a..e6fc495b872 100644
--- a/tests/unit/Http/Cookie/SendCest.php
+++ b/tests/unit/Http/Cookie/SendCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
 use Phalcon\Http\Cookie\CookieInterface;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class SendCest
diff --git a/tests/unit/Http/Cookie/SetSignKeyCest.php b/tests/unit/Http/Cookie/SetSignKeyCest.php
index 74b72603ad4..0d55b5360d9 100644
--- a/tests/unit/Http/Cookie/SetSignKeyCest.php
+++ b/tests/unit/Http/Cookie/SetSignKeyCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
 use Phalcon\Http\Cookie\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class SetSignKeyCest
diff --git a/tests/unit/Http/Cookie/ToStringCest.php b/tests/unit/Http/Cookie/ToStringCest.php
index 2a234a68324..fc5bf8197b9 100644
--- a/tests/unit/Http/Cookie/ToStringCest.php
+++ b/tests/unit/Http/Cookie/ToStringCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class ToStringCest
diff --git a/tests/unit/Http/Cookie/UseEncryptionIsCest.php b/tests/unit/Http/Cookie/UseEncryptionIsCest.php
index def61f1ecbd..df228db281f 100644
--- a/tests/unit/Http/Cookie/UseEncryptionIsCest.php
+++ b/tests/unit/Http/Cookie/UseEncryptionIsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Cookie;
+namespace Phalcon\Tests\Unit\Http\Cookie;
 
 use Phalcon\Http\Cookie;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class UseEncryptionIsCest
diff --git a/tests/unit/Http/Helper/HttpBase.php b/tests/unit/Http/Helper/HttpBase.php
index 70fe39d6f11..5dbb9511c07 100644
--- a/tests/unit/Http/Helper/HttpBase.php
+++ b/tests/unit/Http/Helper/HttpBase.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Helper;
+namespace Phalcon\Tests\Unit\Http\Helper;
 
 use Phalcon\Di;
 use Phalcon\Http\Request;
 use Phalcon\Http\Response;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class HttpBase
diff --git a/tests/unit/Http/Message/Request/ConstructCest.php b/tests/unit/Http/Message/Request/ConstructCest.php
index b316f5d7a76..2e1553bc2e8 100644
--- a/tests/unit/Http/Message/Request/ConstructCest.php
+++ b/tests/unit/Http/Message/Request/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Request;
diff --git a/tests/unit/Http/Message/Request/GetBodyCest.php b/tests/unit/Http/Message/Request/GetBodyCest.php
index 157e6ed4b94..31b0061a31d 100644
--- a/tests/unit/Http/Message/Request/GetBodyCest.php
+++ b/tests/unit/Http/Message/Request/GetBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Request/GetHeaderCest.php b/tests/unit/Http/Message/Request/GetHeaderCest.php
index 306a83dfa4a..5112cf9dd9e 100644
--- a/tests/unit/Http/Message/Request/GetHeaderCest.php
+++ b/tests/unit/Http/Message/Request/GetHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Request/GetHeaderLineCest.php b/tests/unit/Http/Message/Request/GetHeaderLineCest.php
index 4ab074adee3..e0666e13bf2 100644
--- a/tests/unit/Http/Message/Request/GetHeaderLineCest.php
+++ b/tests/unit/Http/Message/Request/GetHeaderLineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Request/GetHeadersCest.php b/tests/unit/Http/Message/Request/GetHeadersCest.php
index b26c1c05c12..4f977d90840 100644
--- a/tests/unit/Http/Message/Request/GetHeadersCest.php
+++ b/tests/unit/Http/Message/Request/GetHeadersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Collection;
 use Phalcon\Http\Message\Request;
diff --git a/tests/unit/Http/Message/Request/GetMethodCest.php b/tests/unit/Http/Message/Request/GetMethodCest.php
index b6df474c820..5f77ed94171 100644
--- a/tests/unit/Http/Message/Request/GetMethodCest.php
+++ b/tests/unit/Http/Message/Request/GetMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use InvalidArgumentException;
 use Phalcon\Http\Message\Request;
diff --git a/tests/unit/Http/Message/Request/GetProtocolVersionCest.php b/tests/unit/Http/Message/Request/GetProtocolVersionCest.php
index 6d71c0d29b9..88257723231 100644
--- a/tests/unit/Http/Message/Request/GetProtocolVersionCest.php
+++ b/tests/unit/Http/Message/Request/GetProtocolVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Request/GetRequestTargetCest.php b/tests/unit/Http/Message/Request/GetRequestTargetCest.php
index d79425b7987..86a6af4c4e5 100644
--- a/tests/unit/Http/Message/Request/GetRequestTargetCest.php
+++ b/tests/unit/Http/Message/Request/GetRequestTargetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/Request/GetUriCest.php b/tests/unit/Http/Message/Request/GetUriCest.php
index 68a67ea9d71..3d5e3d44509 100644
--- a/tests/unit/Http/Message/Request/GetUriCest.php
+++ b/tests/unit/Http/Message/Request/GetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/Request/HasHeaderCest.php b/tests/unit/Http/Message/Request/HasHeaderCest.php
index 462a9806d9e..1921f70670d 100644
--- a/tests/unit/Http/Message/Request/HasHeaderCest.php
+++ b/tests/unit/Http/Message/Request/HasHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Request/WithAddedHeaderCest.php b/tests/unit/Http/Message/Request/WithAddedHeaderCest.php
index b0e3791f8c3..210cfd29709 100644
--- a/tests/unit/Http/Message/Request/WithAddedHeaderCest.php
+++ b/tests/unit/Http/Message/Request/WithAddedHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Request;
diff --git a/tests/unit/Http/Message/Request/WithBodyCest.php b/tests/unit/Http/Message/Request/WithBodyCest.php
index f6e63925714..a49d3c865f2 100644
--- a/tests/unit/Http/Message/Request/WithBodyCest.php
+++ b/tests/unit/Http/Message/Request/WithBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Request/WithHeaderCest.php b/tests/unit/Http/Message/Request/WithHeaderCest.php
index 9fa2706b9ca..9724e2f1a6e 100644
--- a/tests/unit/Http/Message/Request/WithHeaderCest.php
+++ b/tests/unit/Http/Message/Request/WithHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Request/WithMethodCest.php b/tests/unit/Http/Message/Request/WithMethodCest.php
index 63c79a185a8..2dba1853661 100644
--- a/tests/unit/Http/Message/Request/WithMethodCest.php
+++ b/tests/unit/Http/Message/Request/WithMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Request/WithProtocolVersionCest.php b/tests/unit/Http/Message/Request/WithProtocolVersionCest.php
index 99e3b09e0ad..838a1db49a7 100644
--- a/tests/unit/Http/Message/Request/WithProtocolVersionCest.php
+++ b/tests/unit/Http/Message/Request/WithProtocolVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Request;
diff --git a/tests/unit/Http/Message/Request/WithRequestTargetCest.php b/tests/unit/Http/Message/Request/WithRequestTargetCest.php
index 7e4421ecd3e..692ced07628 100644
--- a/tests/unit/Http/Message/Request/WithRequestTargetCest.php
+++ b/tests/unit/Http/Message/Request/WithRequestTargetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Request;
diff --git a/tests/unit/Http/Message/Request/WithUriCest.php b/tests/unit/Http/Message/Request/WithUriCest.php
index f4f6eaef97d..6ca47ac93b4 100644
--- a/tests/unit/Http/Message/Request/WithUriCest.php
+++ b/tests/unit/Http/Message/Request/WithUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/Request/WithoutHeaderCest.php b/tests/unit/Http/Message/Request/WithoutHeaderCest.php
index 02383255b7b..7f03df714df 100644
--- a/tests/unit/Http/Message/Request/WithoutHeaderCest.php
+++ b/tests/unit/Http/Message/Request/WithoutHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Request;
+namespace Phalcon\Tests\Unit\Http\Message\Request;
 
 use Phalcon\Http\Message\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Message/RequestFactory/ConstructCest.php b/tests/unit/Http/Message/RequestFactory/ConstructCest.php
index 2fe72f9f3c0..9db8f601155 100644
--- a/tests/unit/Http/Message/RequestFactory/ConstructCest.php
+++ b/tests/unit/Http/Message/RequestFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\RequestFactory;
+namespace Phalcon\Tests\Unit\Http\Message\RequestFactory;
 
 use Phalcon\Http\Message\Request;
 use Psr\Http\Message\RequestInterface;
diff --git a/tests/unit/Http/Message/RequestFactory/CreateRequestCest.php b/tests/unit/Http/Message/RequestFactory/CreateRequestCest.php
index 48c2d3fdfb3..128f57e79c4 100644
--- a/tests/unit/Http/Message/RequestFactory/CreateRequestCest.php
+++ b/tests/unit/Http/Message/RequestFactory/CreateRequestCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\RequestFactory;
+namespace Phalcon\Tests\Unit\Http\Message\RequestFactory;
 
 use Phalcon\Http\Message\RequestFactory;
 use Psr\Http\Message\RequestInterface;
diff --git a/tests/unit/Http/Message/Response/ConstructCest.php b/tests/unit/Http/Message/Response/ConstructCest.php
index eb5efa96fb7..f1ebba2f57c 100644
--- a/tests/unit/Http/Message/Response/ConstructCest.php
+++ b/tests/unit/Http/Message/Response/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/unit/Http/Message/Response/GetBodyCest.php b/tests/unit/Http/Message/Response/GetBodyCest.php
index 2b489120c4b..055b4e194ca 100644
--- a/tests/unit/Http/Message/Response/GetBodyCest.php
+++ b/tests/unit/Http/Message/Response/GetBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Response/GetHeaderCest.php b/tests/unit/Http/Message/Response/GetHeaderCest.php
index 87a35c4d751..6fd62939ea2 100644
--- a/tests/unit/Http/Message/Response/GetHeaderCest.php
+++ b/tests/unit/Http/Message/Response/GetHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/GetHeaderLineCest.php b/tests/unit/Http/Message/Response/GetHeaderLineCest.php
index a2374866300..021c04eb8ae 100644
--- a/tests/unit/Http/Message/Response/GetHeaderLineCest.php
+++ b/tests/unit/Http/Message/Response/GetHeaderLineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/GetHeadersCest.php b/tests/unit/Http/Message/Response/GetHeadersCest.php
index c546ebeded0..98e3ea0dddd 100644
--- a/tests/unit/Http/Message/Response/GetHeadersCest.php
+++ b/tests/unit/Http/Message/Response/GetHeadersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/GetProtocolVersionCest.php b/tests/unit/Http/Message/Response/GetProtocolVersionCest.php
index 11d4fb6f9bf..048a14cda85 100644
--- a/tests/unit/Http/Message/Response/GetProtocolVersionCest.php
+++ b/tests/unit/Http/Message/Response/GetProtocolVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/GetReasonPhraseCest.php b/tests/unit/Http/Message/Response/GetReasonPhraseCest.php
index 9ea9a50eb8f..eeda62736f6 100644
--- a/tests/unit/Http/Message/Response/GetReasonPhraseCest.php
+++ b/tests/unit/Http/Message/Response/GetReasonPhraseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/GetStatusCodeCest.php b/tests/unit/Http/Message/Response/GetStatusCodeCest.php
index 56f4890a83b..3565ce21206 100644
--- a/tests/unit/Http/Message/Response/GetStatusCodeCest.php
+++ b/tests/unit/Http/Message/Response/GetStatusCodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use InvalidArgumentException;
 use Phalcon\Http\Message\Response;
diff --git a/tests/unit/Http/Message/Response/HasHeaderCest.php b/tests/unit/Http/Message/Response/HasHeaderCest.php
index 1bccc4a9e35..c9713a120da 100644
--- a/tests/unit/Http/Message/Response/HasHeaderCest.php
+++ b/tests/unit/Http/Message/Response/HasHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/WithAddedHeaderCest.php b/tests/unit/Http/Message/Response/WithAddedHeaderCest.php
index b1395a80c57..af1b54a3731 100644
--- a/tests/unit/Http/Message/Response/WithAddedHeaderCest.php
+++ b/tests/unit/Http/Message/Response/WithAddedHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/WithBodyCest.php b/tests/unit/Http/Message/Response/WithBodyCest.php
index 2e745ea735b..e31c88ffa7c 100644
--- a/tests/unit/Http/Message/Response/WithBodyCest.php
+++ b/tests/unit/Http/Message/Response/WithBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Response/WithHeaderCest.php b/tests/unit/Http/Message/Response/WithHeaderCest.php
index 14c3fb259de..731653668f8 100644
--- a/tests/unit/Http/Message/Response/WithHeaderCest.php
+++ b/tests/unit/Http/Message/Response/WithHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Response/WithProtocolVersionCest.php b/tests/unit/Http/Message/Response/WithProtocolVersionCest.php
index d83c75044f4..2004b709e00 100644
--- a/tests/unit/Http/Message/Response/WithProtocolVersionCest.php
+++ b/tests/unit/Http/Message/Response/WithProtocolVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use InvalidArgumentException;
 use Phalcon\Http\Message\Response;
diff --git a/tests/unit/Http/Message/Response/WithStatusCest.php b/tests/unit/Http/Message/Response/WithStatusCest.php
index c8bbf984536..e480ee96ba0 100644
--- a/tests/unit/Http/Message/Response/WithStatusCest.php
+++ b/tests/unit/Http/Message/Response/WithStatusCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Response;
diff --git a/tests/unit/Http/Message/Response/WithoutHeaderCest.php b/tests/unit/Http/Message/Response/WithoutHeaderCest.php
index 198220f95d8..4a50c37d538 100644
--- a/tests/unit/Http/Message/Response/WithoutHeaderCest.php
+++ b/tests/unit/Http/Message/Response/WithoutHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Response;
+namespace Phalcon\Tests\Unit\Http\Message\Response;
 
 use Phalcon\Http\Message\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ResponseFactory/ConstructCest.php b/tests/unit/Http/Message/ResponseFactory/ConstructCest.php
index ba61402c00a..016899a57cf 100644
--- a/tests/unit/Http/Message/ResponseFactory/ConstructCest.php
+++ b/tests/unit/Http/Message/ResponseFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ResponseFactory;
+namespace Phalcon\Tests\Unit\Http\Message\ResponseFactory;
 
 use Phalcon\Http\Message\Response;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/unit/Http/Message/ResponseFactory/CreateResponseCest.php b/tests/unit/Http/Message/ResponseFactory/CreateResponseCest.php
index cdd02fb9162..c8d03f18de7 100644
--- a/tests/unit/Http/Message/ResponseFactory/CreateResponseCest.php
+++ b/tests/unit/Http/Message/ResponseFactory/CreateResponseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ResponseFactory;
+namespace Phalcon\Tests\Unit\Http\Message\ResponseFactory;
 
 use Phalcon\Http\Message\ResponseFactory;
 use Psr\Http\Message\ResponseInterface;
diff --git a/tests/unit/Http/Message/ServerRequest/ConstructCest.php b/tests/unit/Http/Message/ServerRequest/ConstructCest.php
index 4ce911d8fbe..7e8455ea34e 100644
--- a/tests/unit/Http/Message/ServerRequest/ConstructCest.php
+++ b/tests/unit/Http/Message/ServerRequest/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/ServerRequest/GetAttributeCest.php b/tests/unit/Http/Message/ServerRequest/GetAttributeCest.php
index 0509d8862b6..0e165ac27e3 100644
--- a/tests/unit/Http/Message/ServerRequest/GetAttributeCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetAttributesCest.php b/tests/unit/Http/Message/ServerRequest/GetAttributesCest.php
index b6988559a26..44d3689d9e9 100644
--- a/tests/unit/Http/Message/ServerRequest/GetAttributesCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetAttributesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetBodyCest.php b/tests/unit/Http/Message/ServerRequest/GetBodyCest.php
index 5138df429e4..cb2c6e24588 100644
--- a/tests/unit/Http/Message/ServerRequest/GetBodyCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/ServerRequest/GetCookieParamsCest.php b/tests/unit/Http/Message/ServerRequest/GetCookieParamsCest.php
index 228c8fd41a9..07091dfb2c2 100644
--- a/tests/unit/Http/Message/ServerRequest/GetCookieParamsCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetCookieParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetHeaderCest.php b/tests/unit/Http/Message/ServerRequest/GetHeaderCest.php
index eb6b6c75cfd..00b56d9d608 100644
--- a/tests/unit/Http/Message/ServerRequest/GetHeaderCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetHeaderLineCest.php b/tests/unit/Http/Message/ServerRequest/GetHeaderLineCest.php
index 023af4944f6..bbc5aaf6e67 100644
--- a/tests/unit/Http/Message/ServerRequest/GetHeaderLineCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetHeaderLineCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetHeadersCest.php b/tests/unit/Http/Message/ServerRequest/GetHeadersCest.php
index fb98cfae8cb..f5290add58a 100644
--- a/tests/unit/Http/Message/ServerRequest/GetHeadersCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetHeadersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Collection;
 use Phalcon\Http\Message\ServerRequest;
diff --git a/tests/unit/Http/Message/ServerRequest/GetMethodCest.php b/tests/unit/Http/Message/ServerRequest/GetMethodCest.php
index d0b5814c631..e2f0eba44cb 100644
--- a/tests/unit/Http/Message/ServerRequest/GetMethodCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use InvalidArgumentException;
 use Phalcon\Http\Message\ServerRequest;
diff --git a/tests/unit/Http/Message/ServerRequest/GetParsedBodyCest.php b/tests/unit/Http/Message/ServerRequest/GetParsedBodyCest.php
index 3e8e4f1139f..479fc0eeea0 100644
--- a/tests/unit/Http/Message/ServerRequest/GetParsedBodyCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetParsedBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetProtocolVersionCest.php b/tests/unit/Http/Message/ServerRequest/GetProtocolVersionCest.php
index d254c877578..f3e81d2e54a 100644
--- a/tests/unit/Http/Message/ServerRequest/GetProtocolVersionCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetProtocolVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetQueryParamsCest.php b/tests/unit/Http/Message/ServerRequest/GetQueryParamsCest.php
index a1e18ac0889..9a017420337 100644
--- a/tests/unit/Http/Message/ServerRequest/GetQueryParamsCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetQueryParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetRequestTargetCest.php b/tests/unit/Http/Message/ServerRequest/GetRequestTargetCest.php
index df50bcfe978..7a1a242fba5 100644
--- a/tests/unit/Http/Message/ServerRequest/GetRequestTargetCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetRequestTargetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetServerParamsCest.php b/tests/unit/Http/Message/ServerRequest/GetServerParamsCest.php
index df2cf76c6df..c69b73cbd0a 100644
--- a/tests/unit/Http/Message/ServerRequest/GetServerParamsCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetServerParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/GetUploadedFilesCest.php b/tests/unit/Http/Message/ServerRequest/GetUploadedFilesCest.php
index 982058d3223..7c9e196581d 100644
--- a/tests/unit/Http/Message/ServerRequest/GetUploadedFilesCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetUploadedFilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use InvalidArgumentException;
 use Phalcon\Http\Message\ServerRequest;
diff --git a/tests/unit/Http/Message/ServerRequest/GetUriCest.php b/tests/unit/Http/Message/ServerRequest/GetUriCest.php
index 014d051373f..97bf2379066 100644
--- a/tests/unit/Http/Message/ServerRequest/GetUriCest.php
+++ b/tests/unit/Http/Message/ServerRequest/GetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/ServerRequest/HasHeaderCest.php b/tests/unit/Http/Message/ServerRequest/HasHeaderCest.php
index d4bfeddade5..2b2f1bdce84 100644
--- a/tests/unit/Http/Message/ServerRequest/HasHeaderCest.php
+++ b/tests/unit/Http/Message/ServerRequest/HasHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithAddedHeaderCest.php b/tests/unit/Http/Message/ServerRequest/WithAddedHeaderCest.php
index 57dcbcf31ad..869ed06034c 100644
--- a/tests/unit/Http/Message/ServerRequest/WithAddedHeaderCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithAddedHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithAttributeCest.php b/tests/unit/Http/Message/ServerRequest/WithAttributeCest.php
index d91481bcd87..7069d625465 100644
--- a/tests/unit/Http/Message/ServerRequest/WithAttributeCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithBodyCest.php b/tests/unit/Http/Message/ServerRequest/WithBodyCest.php
index 5099b7ebbd9..66e393d6573 100644
--- a/tests/unit/Http/Message/ServerRequest/WithBodyCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/ServerRequest/WithCookieParamsCest.php b/tests/unit/Http/Message/ServerRequest/WithCookieParamsCest.php
index e8dab1df31b..ba28ed1969f 100644
--- a/tests/unit/Http/Message/ServerRequest/WithCookieParamsCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithCookieParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithHeaderCest.php b/tests/unit/Http/Message/ServerRequest/WithHeaderCest.php
index 4fa0bd7edfc..97c52c69b3e 100644
--- a/tests/unit/Http/Message/ServerRequest/WithHeaderCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithMethodCest.php b/tests/unit/Http/Message/ServerRequest/WithMethodCest.php
index 709c84dd1ed..ffd072f3b96 100644
--- a/tests/unit/Http/Message/ServerRequest/WithMethodCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithParsedBodyCest.php b/tests/unit/Http/Message/ServerRequest/WithParsedBodyCest.php
index cbf5830b0b1..c84f0cdf58d 100644
--- a/tests/unit/Http/Message/ServerRequest/WithParsedBodyCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithParsedBodyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithProtocolVersionCest.php b/tests/unit/Http/Message/ServerRequest/WithProtocolVersionCest.php
index df79ee1fe44..cd7db29d47f 100644
--- a/tests/unit/Http/Message/ServerRequest/WithProtocolVersionCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithProtocolVersionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithQueryParamsCest.php b/tests/unit/Http/Message/ServerRequest/WithQueryParamsCest.php
index e4562c91899..a833eeb81b3 100644
--- a/tests/unit/Http/Message/ServerRequest/WithQueryParamsCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithQueryParamsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithRequestTargetCest.php b/tests/unit/Http/Message/ServerRequest/WithRequestTargetCest.php
index d74d42bde99..fb92ed1a4d3 100644
--- a/tests/unit/Http/Message/ServerRequest/WithRequestTargetCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithRequestTargetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithUploadedFilesCest.php b/tests/unit/Http/Message/ServerRequest/WithUploadedFilesCest.php
index 9091ff91ff3..839870e7a04 100644
--- a/tests/unit/Http/Message/ServerRequest/WithUploadedFilesCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithUploadedFilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use InvalidArgumentException;
 use Phalcon\Http\Message\ServerRequest;
diff --git a/tests/unit/Http/Message/ServerRequest/WithUriCest.php b/tests/unit/Http/Message/ServerRequest/WithUriCest.php
index 19516b5e7a4..aceb3d02d8a 100644
--- a/tests/unit/Http/Message/ServerRequest/WithUriCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/ServerRequest/WithoutAttributeCest.php b/tests/unit/Http/Message/ServerRequest/WithoutAttributeCest.php
index adfc065976a..140131df826 100644
--- a/tests/unit/Http/Message/ServerRequest/WithoutAttributeCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithoutAttributeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequest/WithoutHeaderCest.php b/tests/unit/Http/Message/ServerRequest/WithoutHeaderCest.php
index 35a6bd0ac60..cf3612d62e3 100644
--- a/tests/unit/Http/Message/ServerRequest/WithoutHeaderCest.php
+++ b/tests/unit/Http/Message/ServerRequest/WithoutHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequest;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequest;
 
 use Phalcon\Http\Message\ServerRequest;
 use UnitTester;
diff --git a/tests/unit/Http/Message/ServerRequestFactory/ConstructCest.php b/tests/unit/Http/Message/ServerRequestFactory/ConstructCest.php
index d751203bebb..6691b9d445b 100644
--- a/tests/unit/Http/Message/ServerRequestFactory/ConstructCest.php
+++ b/tests/unit/Http/Message/ServerRequestFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequestFactory;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequestFactory;
 
 use Phalcon\Http\Message\ServerRequestFactory;
 use Psr\Http\Message\ServerRequestFactoryInterface;
diff --git a/tests/unit/Http/Message/ServerRequestFactory/CreateServerRequestCest.php b/tests/unit/Http/Message/ServerRequestFactory/CreateServerRequestCest.php
index 1d2f2f3bf5b..53796fadeb2 100644
--- a/tests/unit/Http/Message/ServerRequestFactory/CreateServerRequestCest.php
+++ b/tests/unit/Http/Message/ServerRequestFactory/CreateServerRequestCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequestFactory;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequestFactory;
 
 use Phalcon\Http\Message\ServerRequestFactory;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/tests/unit/Http/Message/ServerRequestFactory/LoadCest.php b/tests/unit/Http/Message/ServerRequestFactory/LoadCest.php
index 5c06566d6c8..23937d81ac0 100644
--- a/tests/unit/Http/Message/ServerRequestFactory/LoadCest.php
+++ b/tests/unit/Http/Message/ServerRequestFactory/LoadCest.php
@@ -11,20 +11,20 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\ServerRequestFactory;
+namespace Phalcon\Tests\Unit\Http\Message\ServerRequestFactory;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\ServerRequestFactory;
 use Phalcon\Http\Message\UploadedFile;
-use Phalcon\Test\Fixtures\Http\Message\ServerRequestFactoryFixture;
+use Phalcon\Tests\Fixtures\Http\Message\ServerRequestFactoryFixture;
 use Psr\Http\Message\ServerRequestInterface;
 use UnitTester;
 
 /**
  * Class LoadCest
  *
- * @package Phalcon\Test\Unit\Http\Message\ServerRequestFactory
+ * @package Phalcon\Tests\Unit\Http\Message\ServerRequestFactory
  *
  * @property array $storeCookie
  * @property array $storeFiles
diff --git a/tests/unit/Http/Message/Stream/CloseCest.php b/tests/unit/Http/Message/Stream/CloseCest.php
index a8a19ddc790..1b70e90244e 100644
--- a/tests/unit/Http/Message/Stream/CloseCest.php
+++ b/tests/unit/Http/Message/Stream/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/ConstructCest.php b/tests/unit/Http/Message/Stream/ConstructCest.php
index be1d9aaeafd..d33d62aa11f 100644
--- a/tests/unit/Http/Message/Stream/ConstructCest.php
+++ b/tests/unit/Http/Message/Stream/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Stream/DetachCest.php b/tests/unit/Http/Message/Stream/DetachCest.php
index ee6389614c9..6f4f50a6640 100644
--- a/tests/unit/Http/Message/Stream/DetachCest.php
+++ b/tests/unit/Http/Message/Stream/DetachCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/EofCest.php b/tests/unit/Http/Message/Stream/EofCest.php
index e930ee5d96d..1692c9f268d 100644
--- a/tests/unit/Http/Message/Stream/EofCest.php
+++ b/tests/unit/Http/Message/Stream/EofCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/GetContentsCest.php b/tests/unit/Http/Message/Stream/GetContentsCest.php
index 2ed4c37ea43..09fabe50a84 100644
--- a/tests/unit/Http/Message/Stream/GetContentsCest.php
+++ b/tests/unit/Http/Message/Stream/GetContentsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use RuntimeException;
diff --git a/tests/unit/Http/Message/Stream/GetMetadataCest.php b/tests/unit/Http/Message/Stream/GetMetadataCest.php
index 25d2457fdef..6b73cb9eee1 100644
--- a/tests/unit/Http/Message/Stream/GetMetadataCest.php
+++ b/tests/unit/Http/Message/Stream/GetMetadataCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Stream;
-use Phalcon\Test\Fixtures\Http\Message\StreamFixture;
+use Phalcon\Tests\Fixtures\Http\Message\StreamFixture;
 use UnitTester;
 
 class GetMetadataCest
diff --git a/tests/unit/Http/Message/Stream/GetSizeCest.php b/tests/unit/Http/Message/Stream/GetSizeCest.php
index 8a830741d92..3a5f72e9791 100644
--- a/tests/unit/Http/Message/Stream/GetSizeCest.php
+++ b/tests/unit/Http/Message/Stream/GetSizeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
-use Phalcon\Test\Fixtures\Http\Message\StreamFixture;
+use Phalcon\Tests\Fixtures\Http\Message\StreamFixture;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Http/Message/Stream/Input/ConstructCest.php b/tests/unit/Http/Message/Stream/Input/ConstructCest.php
index 577028913d4..37e22812306 100644
--- a/tests/unit/Http/Message/Stream/Input/ConstructCest.php
+++ b/tests/unit/Http/Message/Stream/Input/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Input;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Input;
 
 use Phalcon\Http\Message\Stream\Input;
 use Psr\Http\Message\StreamInterface;
diff --git a/tests/unit/Http/Message/Stream/Input/IsReadableCest.php b/tests/unit/Http/Message/Stream/Input/IsReadableCest.php
index 51bb58999e4..f03330e0024 100644
--- a/tests/unit/Http/Message/Stream/Input/IsReadableCest.php
+++ b/tests/unit/Http/Message/Stream/Input/IsReadableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Input;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Input;
 
 use Phalcon\Http\Message\Stream\Input;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/Input/IsSeekableCest.php b/tests/unit/Http/Message/Stream/Input/IsSeekableCest.php
index 135c85cc3af..7e8332171c6 100644
--- a/tests/unit/Http/Message/Stream/Input/IsSeekableCest.php
+++ b/tests/unit/Http/Message/Stream/Input/IsSeekableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Input;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Input;
 
 use Phalcon\Http\Message\Stream\Input;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/Input/IsWritableCest.php b/tests/unit/Http/Message/Stream/Input/IsWritableCest.php
index 06289e3d5e0..e4a8111ca95 100644
--- a/tests/unit/Http/Message/Stream/Input/IsWritableCest.php
+++ b/tests/unit/Http/Message/Stream/Input/IsWritableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Input;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Input;
 
 use Phalcon\Http\Message\Stream\Input;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/IsReadableCest.php b/tests/unit/Http/Message/Stream/IsReadableCest.php
index b01a5490dbb..10b39a6505f 100644
--- a/tests/unit/Http/Message/Stream/IsReadableCest.php
+++ b/tests/unit/Http/Message/Stream/IsReadableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Stream/IsSeekableCest.php b/tests/unit/Http/Message/Stream/IsSeekableCest.php
index 9d683e287f8..f4545345127 100644
--- a/tests/unit/Http/Message/Stream/IsSeekableCest.php
+++ b/tests/unit/Http/Message/Stream/IsSeekableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Stream/IsWritableCest.php b/tests/unit/Http/Message/Stream/IsWritableCest.php
index 71b7dc9b222..50123a3fd88 100644
--- a/tests/unit/Http/Message/Stream/IsWritableCest.php
+++ b/tests/unit/Http/Message/Stream/IsWritableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/Stream/Memory/ConstructCest.php b/tests/unit/Http/Message/Stream/Memory/ConstructCest.php
index f31cf442918..815747e11b4 100644
--- a/tests/unit/Http/Message/Stream/Memory/ConstructCest.php
+++ b/tests/unit/Http/Message/Stream/Memory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Memory;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Memory;
 
 use Phalcon\Http\Message\Stream\Memory;
 use Psr\Http\Message\StreamInterface;
diff --git a/tests/unit/Http/Message/Stream/Memory/IsReadableCest.php b/tests/unit/Http/Message/Stream/Memory/IsReadableCest.php
index ae0b060b425..feba36895eb 100644
--- a/tests/unit/Http/Message/Stream/Memory/IsReadableCest.php
+++ b/tests/unit/Http/Message/Stream/Memory/IsReadableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Memory;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Memory;
 
 use Phalcon\Http\Message\Stream\Memory;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/Memory/IsSeekableCest.php b/tests/unit/Http/Message/Stream/Memory/IsSeekableCest.php
index 73872feeede..7de3c562160 100644
--- a/tests/unit/Http/Message/Stream/Memory/IsSeekableCest.php
+++ b/tests/unit/Http/Message/Stream/Memory/IsSeekableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Memory;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Memory;
 
 use Phalcon\Http\Message\Stream\Memory;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/Memory/IsWritableCest.php b/tests/unit/Http/Message/Stream/Memory/IsWritableCest.php
index 0b143fd97e3..153a221b98b 100644
--- a/tests/unit/Http/Message/Stream/Memory/IsWritableCest.php
+++ b/tests/unit/Http/Message/Stream/Memory/IsWritableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Memory;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Memory;
 
 use Phalcon\Http\Message\Stream\Memory;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/ReadCest.php b/tests/unit/Http/Message/Stream/ReadCest.php
index 63c65c5dea6..71a94aa468c 100644
--- a/tests/unit/Http/Message/Stream/ReadCest.php
+++ b/tests/unit/Http/Message/Stream/ReadCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use RuntimeException;
diff --git a/tests/unit/Http/Message/Stream/RewindCest.php b/tests/unit/Http/Message/Stream/RewindCest.php
index 71330dd45bd..a11a9d20924 100644
--- a/tests/unit/Http/Message/Stream/RewindCest.php
+++ b/tests/unit/Http/Message/Stream/RewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use RuntimeException;
diff --git a/tests/unit/Http/Message/Stream/SeekCest.php b/tests/unit/Http/Message/Stream/SeekCest.php
index b3b3d6cddd2..1fb7fa55061 100644
--- a/tests/unit/Http/Message/Stream/SeekCest.php
+++ b/tests/unit/Http/Message/Stream/SeekCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
-use Phalcon\Test\Fixtures\Http\Message\StreamFixture;
+use Phalcon\Tests\Fixtures\Http\Message\StreamFixture;
 use RuntimeException;
 use UnitTester;
 
diff --git a/tests/unit/Http/Message/Stream/SetStreamCest.php b/tests/unit/Http/Message/Stream/SetStreamCest.php
index 8287dbd4c2e..ced54ad7043 100644
--- a/tests/unit/Http/Message/Stream/SetStreamCest.php
+++ b/tests/unit/Http/Message/Stream/SetStreamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/TellCest.php b/tests/unit/Http/Message/Stream/TellCest.php
index eb2e8253065..5f78b535741 100644
--- a/tests/unit/Http/Message/Stream/TellCest.php
+++ b/tests/unit/Http/Message/Stream/TellCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use RuntimeException;
diff --git a/tests/unit/Http/Message/Stream/Temp/ConstructCest.php b/tests/unit/Http/Message/Stream/Temp/ConstructCest.php
index fef0c893925..4bf63d003da 100644
--- a/tests/unit/Http/Message/Stream/Temp/ConstructCest.php
+++ b/tests/unit/Http/Message/Stream/Temp/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Temp;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Temp;
 
 use Phalcon\Http\Message\Stream\Temp;
 use Psr\Http\Message\StreamInterface;
diff --git a/tests/unit/Http/Message/Stream/Temp/IsReadableCest.php b/tests/unit/Http/Message/Stream/Temp/IsReadableCest.php
index e79e0779384..9aa1039350b 100644
--- a/tests/unit/Http/Message/Stream/Temp/IsReadableCest.php
+++ b/tests/unit/Http/Message/Stream/Temp/IsReadableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Temp;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Temp;
 
 use Phalcon\Http\Message\Stream\Temp;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/Temp/IsSeekableCest.php b/tests/unit/Http/Message/Stream/Temp/IsSeekableCest.php
index 58879a86f25..53ca931e681 100644
--- a/tests/unit/Http/Message/Stream/Temp/IsSeekableCest.php
+++ b/tests/unit/Http/Message/Stream/Temp/IsSeekableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Temp;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Temp;
 
 use Phalcon\Http\Message\Stream\Temp;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/Temp/IsWritableCest.php b/tests/unit/Http/Message/Stream/Temp/IsWritableCest.php
index cabedb8654a..d2919d6290e 100644
--- a/tests/unit/Http/Message/Stream/Temp/IsWritableCest.php
+++ b/tests/unit/Http/Message/Stream/Temp/IsWritableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream\Temp;
+namespace Phalcon\Tests\Unit\Http\Message\Stream\Temp;
 
 use Phalcon\Http\Message\Stream\Temp;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/ToStringCest.php b/tests/unit/Http/Message/Stream/ToStringCest.php
index da63f27eb87..36af9546073 100644
--- a/tests/unit/Http/Message/Stream/ToStringCest.php
+++ b/tests/unit/Http/Message/Stream/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Stream/WriteCest.php b/tests/unit/Http/Message/Stream/WriteCest.php
index 4b3435073fc..c68245f0e8a 100644
--- a/tests/unit/Http/Message/Stream/WriteCest.php
+++ b/tests/unit/Http/Message/Stream/WriteCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Stream;
+namespace Phalcon\Tests\Unit\Http\Message\Stream;
 
 use Phalcon\Http\Message\Stream;
-use Phalcon\Test\Fixtures\Http\Message\StreamFixture;
+use Phalcon\Tests\Fixtures\Http\Message\StreamFixture;
 use RuntimeException;
 use UnitTester;
 
diff --git a/tests/unit/Http/Message/StreamFactory/ConstructCest.php b/tests/unit/Http/Message/StreamFactory/ConstructCest.php
index 27b4a78dfab..bf0d024a07f 100644
--- a/tests/unit/Http/Message/StreamFactory/ConstructCest.php
+++ b/tests/unit/Http/Message/StreamFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\StreamFactory;
+namespace Phalcon\Tests\Unit\Http\Message\StreamFactory;
 
 use Phalcon\Http\Message\StreamFactory;
 use Psr\Http\Message\StreamFactoryInterface;
diff --git a/tests/unit/Http/Message/StreamFactory/CreateStreamCest.php b/tests/unit/Http/Message/StreamFactory/CreateStreamCest.php
index 1fae7ff34b6..d89aca50fad 100644
--- a/tests/unit/Http/Message/StreamFactory/CreateStreamCest.php
+++ b/tests/unit/Http/Message/StreamFactory/CreateStreamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\StreamFactory;
+namespace Phalcon\Tests\Unit\Http\Message\StreamFactory;
 
 use Phalcon\Http\Message\Stream;
 use Phalcon\Http\Message\StreamFactory;
diff --git a/tests/unit/Http/Message/StreamFactory/CreateStreamFromFileCest.php b/tests/unit/Http/Message/StreamFactory/CreateStreamFromFileCest.php
index 9e45de2c5a1..888977d8a98 100644
--- a/tests/unit/Http/Message/StreamFactory/CreateStreamFromFileCest.php
+++ b/tests/unit/Http/Message/StreamFactory/CreateStreamFromFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\StreamFactory;
+namespace Phalcon\Tests\Unit\Http\Message\StreamFactory;
 
 use Phalcon\Http\Message\Stream;
 use Phalcon\Http\Message\StreamFactory;
diff --git a/tests/unit/Http/Message/StreamFactory/CreateStreamFromResourceCest.php b/tests/unit/Http/Message/StreamFactory/CreateStreamFromResourceCest.php
index 3c6a54f03b9..e005793ac5a 100644
--- a/tests/unit/Http/Message/StreamFactory/CreateStreamFromResourceCest.php
+++ b/tests/unit/Http/Message/StreamFactory/CreateStreamFromResourceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\StreamFactory;
+namespace Phalcon\Tests\Unit\Http\Message\StreamFactory;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/UploadedFile/ConstructCest.php b/tests/unit/Http/Message/UploadedFile/ConstructCest.php
index 8840cf700b7..913fda14195 100644
--- a/tests/unit/Http/Message/UploadedFile/ConstructCest.php
+++ b/tests/unit/Http/Message/UploadedFile/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
diff --git a/tests/unit/Http/Message/UploadedFile/GetClientFilenameCest.php b/tests/unit/Http/Message/UploadedFile/GetClientFilenameCest.php
index c009a8ac50f..2729e2f2f4a 100644
--- a/tests/unit/Http/Message/UploadedFile/GetClientFilenameCest.php
+++ b/tests/unit/Http/Message/UploadedFile/GetClientFilenameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Phalcon\Http\Message\UploadedFile;
 use UnitTester;
diff --git a/tests/unit/Http/Message/UploadedFile/GetClientMediaTypeCest.php b/tests/unit/Http/Message/UploadedFile/GetClientMediaTypeCest.php
index 5abde6cc528..bb8d79c80c1 100644
--- a/tests/unit/Http/Message/UploadedFile/GetClientMediaTypeCest.php
+++ b/tests/unit/Http/Message/UploadedFile/GetClientMediaTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Phalcon\Http\Message\UploadedFile;
 use UnitTester;
diff --git a/tests/unit/Http/Message/UploadedFile/GetErrorCest.php b/tests/unit/Http/Message/UploadedFile/GetErrorCest.php
index 69a60f1ec52..f53913df0a9 100644
--- a/tests/unit/Http/Message/UploadedFile/GetErrorCest.php
+++ b/tests/unit/Http/Message/UploadedFile/GetErrorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Phalcon\Http\Message\UploadedFile;
 use UnitTester;
diff --git a/tests/unit/Http/Message/UploadedFile/GetSizeCest.php b/tests/unit/Http/Message/UploadedFile/GetSizeCest.php
index d4dbca2d018..a6a1c5ef3c8 100644
--- a/tests/unit/Http/Message/UploadedFile/GetSizeCest.php
+++ b/tests/unit/Http/Message/UploadedFile/GetSizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Phalcon\Http\Message\UploadedFile;
 use UnitTester;
diff --git a/tests/unit/Http/Message/UploadedFile/GetStreamCest.php b/tests/unit/Http/Message/UploadedFile/GetStreamCest.php
index 40437ab77ad..7810f38e3d6 100644
--- a/tests/unit/Http/Message/UploadedFile/GetStreamCest.php
+++ b/tests/unit/Http/Message/UploadedFile/GetStreamCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/UploadedFile/MoveToCest.php b/tests/unit/Http/Message/UploadedFile/MoveToCest.php
index 2b345b12f8d..af4c5750e1e 100644
--- a/tests/unit/Http/Message/UploadedFile/MoveToCest.php
+++ b/tests/unit/Http/Message/UploadedFile/MoveToCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFile;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFile;
 
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Phalcon\Http\Message\Stream;
diff --git a/tests/unit/Http/Message/UploadedFileFactory/ConstructCest.php b/tests/unit/Http/Message/UploadedFileFactory/ConstructCest.php
index b3bed5e6f5b..3cae5b4d21a 100644
--- a/tests/unit/Http/Message/UploadedFileFactory/ConstructCest.php
+++ b/tests/unit/Http/Message/UploadedFileFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFileFactory;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFileFactory;
 
 use Phalcon\Http\Message\UploadedFileFactory;
 use Psr\Http\Message\UploadedFileFactoryInterface;
diff --git a/tests/unit/Http/Message/UploadedFileFactory/CreateUploadedFileCest.php b/tests/unit/Http/Message/UploadedFileFactory/CreateUploadedFileCest.php
index fdac7df9489..736531edec4 100644
--- a/tests/unit/Http/Message/UploadedFileFactory/CreateUploadedFileCest.php
+++ b/tests/unit/Http/Message/UploadedFileFactory/CreateUploadedFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UploadedFileFactory;
+namespace Phalcon\Tests\Unit\Http\Message\UploadedFileFactory;
 
 use Phalcon\Http\Message\Stream;
 use Phalcon\Http\Message\UploadedFileFactory;
diff --git a/tests/unit/Http/Message/Uri/ConstructCest.php b/tests/unit/Http/Message/Uri/ConstructCest.php
index 06d2f4122db..a48e4efa0c5 100644
--- a/tests/unit/Http/Message/Uri/ConstructCest.php
+++ b/tests/unit/Http/Message/Uri/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use Psr\Http\Message\UriInterface;
diff --git a/tests/unit/Http/Message/Uri/GetAuthorityCest.php b/tests/unit/Http/Message/Uri/GetAuthorityCest.php
index 14833a5dae6..07fafd04fcd 100644
--- a/tests/unit/Http/Message/Uri/GetAuthorityCest.php
+++ b/tests/unit/Http/Message/Uri/GetAuthorityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use Phalcon\Http\Message\Uri;
diff --git a/tests/unit/Http/Message/Uri/GetFragmentCest.php b/tests/unit/Http/Message/Uri/GetFragmentCest.php
index 7ca49acf911..9f7e77cc6de 100644
--- a/tests/unit/Http/Message/Uri/GetFragmentCest.php
+++ b/tests/unit/Http/Message/Uri/GetFragmentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/GetHostCest.php b/tests/unit/Http/Message/Uri/GetHostCest.php
index e3247b15128..f81f47f451a 100644
--- a/tests/unit/Http/Message/Uri/GetHostCest.php
+++ b/tests/unit/Http/Message/Uri/GetHostCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/GetPathCest.php b/tests/unit/Http/Message/Uri/GetPathCest.php
index 81d5bf9bdb7..905bd2ffb7a 100644
--- a/tests/unit/Http/Message/Uri/GetPathCest.php
+++ b/tests/unit/Http/Message/Uri/GetPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/GetPortCest.php b/tests/unit/Http/Message/Uri/GetPortCest.php
index 9f50e771d22..fe3eed3c163 100644
--- a/tests/unit/Http/Message/Uri/GetPortCest.php
+++ b/tests/unit/Http/Message/Uri/GetPortCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/GetQueryCest.php b/tests/unit/Http/Message/Uri/GetQueryCest.php
index a38373f9a67..24b0ba26f7a 100644
--- a/tests/unit/Http/Message/Uri/GetQueryCest.php
+++ b/tests/unit/Http/Message/Uri/GetQueryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/GetSchemeCest.php b/tests/unit/Http/Message/Uri/GetSchemeCest.php
index bc920789709..457d78a6e4e 100644
--- a/tests/unit/Http/Message/Uri/GetSchemeCest.php
+++ b/tests/unit/Http/Message/Uri/GetSchemeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/GetUserInfoCest.php b/tests/unit/Http/Message/Uri/GetUserInfoCest.php
index ea7e95abb18..705a8d56783 100644
--- a/tests/unit/Http/Message/Uri/GetUserInfoCest.php
+++ b/tests/unit/Http/Message/Uri/GetUserInfoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/ToStringCest.php b/tests/unit/Http/Message/Uri/ToStringCest.php
index 77b382362c2..a62205ecf20 100644
--- a/tests/unit/Http/Message/Uri/ToStringCest.php
+++ b/tests/unit/Http/Message/Uri/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Phalcon\Http\Message\Uri;
 use UnitTester;
diff --git a/tests/unit/Http/Message/Uri/WithFragmentCest.php b/tests/unit/Http/Message/Uri/WithFragmentCest.php
index d82f4dcecf2..ac96c7a9c55 100644
--- a/tests/unit/Http/Message/Uri/WithFragmentCest.php
+++ b/tests/unit/Http/Message/Uri/WithFragmentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Uri/WithHostCest.php b/tests/unit/Http/Message/Uri/WithHostCest.php
index fa6e94e0fea..b8ba50b4707 100644
--- a/tests/unit/Http/Message/Uri/WithHostCest.php
+++ b/tests/unit/Http/Message/Uri/WithHostCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Uri/WithPathCest.php b/tests/unit/Http/Message/Uri/WithPathCest.php
index 7d8783f73f7..4c5a50f33ee 100644
--- a/tests/unit/Http/Message/Uri/WithPathCest.php
+++ b/tests/unit/Http/Message/Uri/WithPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Uri/WithPortCest.php b/tests/unit/Http/Message/Uri/WithPortCest.php
index 92dde599503..3018944824c 100644
--- a/tests/unit/Http/Message/Uri/WithPortCest.php
+++ b/tests/unit/Http/Message/Uri/WithPortCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Uri/WithQueryCest.php b/tests/unit/Http/Message/Uri/WithQueryCest.php
index baa61f264fe..d5dbcc09a6d 100644
--- a/tests/unit/Http/Message/Uri/WithQueryCest.php
+++ b/tests/unit/Http/Message/Uri/WithQueryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Uri/WithSchemeCest.php b/tests/unit/Http/Message/Uri/WithSchemeCest.php
index 191294cb48d..7de5a194c6c 100644
--- a/tests/unit/Http/Message/Uri/WithSchemeCest.php
+++ b/tests/unit/Http/Message/Uri/WithSchemeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/Uri/WithUserInfoCest.php b/tests/unit/Http/Message/Uri/WithUserInfoCest.php
index 4e204432dd9..192d8f9738f 100644
--- a/tests/unit/Http/Message/Uri/WithUserInfoCest.php
+++ b/tests/unit/Http/Message/Uri/WithUserInfoCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\Uri;
+namespace Phalcon\Tests\Unit\Http\Message\Uri;
 
 use Codeception\Example;
 use InvalidArgumentException;
diff --git a/tests/unit/Http/Message/UriFactory/ConstructCest.php b/tests/unit/Http/Message/UriFactory/ConstructCest.php
index 26f938bb7b4..a06a9f7851b 100644
--- a/tests/unit/Http/Message/UriFactory/ConstructCest.php
+++ b/tests/unit/Http/Message/UriFactory/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UriFactory;
+namespace Phalcon\Tests\Unit\Http\Message\UriFactory;
 
 use Phalcon\Http\Message\UriFactory;
 use Psr\Http\Message\UriFactoryInterface;
diff --git a/tests/unit/Http/Message/UriFactory/CreateUriCest.php b/tests/unit/Http/Message/UriFactory/CreateUriCest.php
index 8903cabd4e1..f8e04698ae2 100644
--- a/tests/unit/Http/Message/UriFactory/CreateUriCest.php
+++ b/tests/unit/Http/Message/UriFactory/CreateUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Message\UriFactory;
+namespace Phalcon\Tests\Unit\Http\Message\UriFactory;
 
 use Phalcon\Http\Message\UriFactory;
 use Psr\Http\Message\UriInterface;
diff --git a/tests/unit/Http/Request/AuthHeaderCest.php b/tests/unit/Http/Request/AuthHeaderCest.php
index 3e065ba7ffd..85c274a1ae9 100644
--- a/tests/unit/Http/Request/AuthHeaderCest.php
+++ b/tests/unit/Http/Request/AuthHeaderCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Codeception\Example;
-use Phalcon\Test\Fixtures\Listener\CustomAuthorizationListener;
-use Phalcon\Test\Fixtures\Listener\NegotiateAuthorizationListener;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Listener\CustomAuthorizationListener;
+use Phalcon\Tests\Fixtures\Listener\NegotiateAuthorizationListener;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class AuthHeaderCest extends HttpBase
diff --git a/tests/unit/Http/Request/ConstructCest.php b/tests/unit/Http/Request/ConstructCest.php
index 4b549d60813..7ff000af77b 100644
--- a/tests/unit/Http/Request/ConstructCest.php
+++ b/tests/unit/Http/Request/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use Phalcon\Http\RequestInterface;
diff --git a/tests/unit/Http/Request/File/ConstructCest.php b/tests/unit/Http/Request/File/ConstructCest.php
index 862d84e405b..c2cdc1e6e24 100644
--- a/tests/unit/Http/Request/File/ConstructCest.php
+++ b/tests/unit/Http/Request/File/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use Phalcon\Http\Request\FileInterface;
diff --git a/tests/unit/Http/Request/File/GetErrorCest.php b/tests/unit/Http/Request/File/GetErrorCest.php
index 359998a2b50..f8861cebb83 100644
--- a/tests/unit/Http/Request/File/GetErrorCest.php
+++ b/tests/unit/Http/Request/File/GetErrorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetExtensionCest.php b/tests/unit/Http/Request/File/GetExtensionCest.php
index 2bda16e1230..b6698bf5017 100644
--- a/tests/unit/Http/Request/File/GetExtensionCest.php
+++ b/tests/unit/Http/Request/File/GetExtensionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetKeyCest.php b/tests/unit/Http/Request/File/GetKeyCest.php
index 46f3816b41f..0ed00240836 100644
--- a/tests/unit/Http/Request/File/GetKeyCest.php
+++ b/tests/unit/Http/Request/File/GetKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetNameCest.php b/tests/unit/Http/Request/File/GetNameCest.php
index c9742d46b0a..2089cc459c4 100644
--- a/tests/unit/Http/Request/File/GetNameCest.php
+++ b/tests/unit/Http/Request/File/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetRealTypeCest.php b/tests/unit/Http/Request/File/GetRealTypeCest.php
index ac1d135c033..33809b62094 100644
--- a/tests/unit/Http/Request/File/GetRealTypeCest.php
+++ b/tests/unit/Http/Request/File/GetRealTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetSizeCest.php b/tests/unit/Http/Request/File/GetSizeCest.php
index 9f79612641c..e3af5859c81 100644
--- a/tests/unit/Http/Request/File/GetSizeCest.php
+++ b/tests/unit/Http/Request/File/GetSizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetTempNameCest.php b/tests/unit/Http/Request/File/GetTempNameCest.php
index 5d644e47b11..294736be7b5 100644
--- a/tests/unit/Http/Request/File/GetTempNameCest.php
+++ b/tests/unit/Http/Request/File/GetTempNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/GetTypeCest.php b/tests/unit/Http/Request/File/GetTypeCest.php
index 64d77814106..7a2e4ea3827 100644
--- a/tests/unit/Http/Request/File/GetTypeCest.php
+++ b/tests/unit/Http/Request/File/GetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/IsUploadedFileCest.php b/tests/unit/Http/Request/File/IsUploadedFileCest.php
index 38262c1c364..46b144b5f16 100644
--- a/tests/unit/Http/Request/File/IsUploadedFileCest.php
+++ b/tests/unit/Http/Request/File/IsUploadedFileCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use Phalcon\Http\Request\File;
 use UnitTester;
diff --git a/tests/unit/Http/Request/File/MoveToCest.php b/tests/unit/Http/Request/File/MoveToCest.php
index d1b252d335a..f70ed702462 100644
--- a/tests/unit/Http/Request/File/MoveToCest.php
+++ b/tests/unit/Http/Request/File/MoveToCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request\File;
+namespace Phalcon\Tests\Unit\Http\Request\File;
 
 use UnitTester;
 
diff --git a/tests/unit/Http/Request/GetAcceptableContentCest.php b/tests/unit/Http/Request/GetAcceptableContentCest.php
index 8a0a9fd2302..e3421dbc168 100644
--- a/tests/unit/Http/Request/GetAcceptableContentCest.php
+++ b/tests/unit/Http/Request/GetAcceptableContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetBasicAuthCest.php b/tests/unit/Http/Request/GetBasicAuthCest.php
index fe5c646f6f6..d6743111171 100644
--- a/tests/unit/Http/Request/GetBasicAuthCest.php
+++ b/tests/unit/Http/Request/GetBasicAuthCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetBestAcceptCest.php b/tests/unit/Http/Request/GetBestAcceptCest.php
index 01b2c205c39..d00fa483d36 100644
--- a/tests/unit/Http/Request/GetBestAcceptCest.php
+++ b/tests/unit/Http/Request/GetBestAcceptCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetBestCharsetCest.php b/tests/unit/Http/Request/GetBestCharsetCest.php
index d8d8dddae3f..cdd745b892e 100644
--- a/tests/unit/Http/Request/GetBestCharsetCest.php
+++ b/tests/unit/Http/Request/GetBestCharsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetBestCharsetCest
diff --git a/tests/unit/Http/Request/GetBestLanguageCest.php b/tests/unit/Http/Request/GetBestLanguageCest.php
index 6658ab0006c..c722f5829a5 100644
--- a/tests/unit/Http/Request/GetBestLanguageCest.php
+++ b/tests/unit/Http/Request/GetBestLanguageCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetBestLanguageCest
diff --git a/tests/unit/Http/Request/GetClientAddressCest.php b/tests/unit/Http/Request/GetClientAddressCest.php
index 50a3fe29ed0..ab6c6d2c9f3 100644
--- a/tests/unit/Http/Request/GetClientAddressCest.php
+++ b/tests/unit/Http/Request/GetClientAddressCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetClientCharsetsCest.php b/tests/unit/Http/Request/GetClientCharsetsCest.php
index cf1a6a9e585..f94fab00e3a 100644
--- a/tests/unit/Http/Request/GetClientCharsetsCest.php
+++ b/tests/unit/Http/Request/GetClientCharsetsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetContentTypeCest.php b/tests/unit/Http/Request/GetContentTypeCest.php
index e4686ba530a..6af930e7446 100644
--- a/tests/unit/Http/Request/GetContentTypeCest.php
+++ b/tests/unit/Http/Request/GetContentTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetDigestAuthCest.php b/tests/unit/Http/Request/GetDigestAuthCest.php
index dfd8c513c97..a9d73c1527c 100644
--- a/tests/unit/Http/Request/GetDigestAuthCest.php
+++ b/tests/unit/Http/Request/GetDigestAuthCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetFilteredPostCest.php b/tests/unit/Http/Request/GetFilteredPostCest.php
index a09d39c8151..eb7025b5fd7 100644
--- a/tests/unit/Http/Request/GetFilteredPostCest.php
+++ b/tests/unit/Http/Request/GetFilteredPostCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Codeception\Example;
 use Phalcon\Http\Request;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function ucfirst;
diff --git a/tests/unit/Http/Request/GetFilteredPutCest.php b/tests/unit/Http/Request/GetFilteredPutCest.php
index f1c3adfd1e5..19cd5161cf8 100644
--- a/tests/unit/Http/Request/GetFilteredPutCest.php
+++ b/tests/unit/Http/Request/GetFilteredPutCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Fixtures\Http\PhpStream;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Http\PhpStream;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function file_put_contents;
diff --git a/tests/unit/Http/Request/GetHTTPRefererCest.php b/tests/unit/Http/Request/GetHTTPRefererCest.php
index 1410d497831..6ebc4ace5b5 100644
--- a/tests/unit/Http/Request/GetHTTPRefererCest.php
+++ b/tests/unit/Http/Request/GetHTTPRefererCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetHeaderCest.php b/tests/unit/Http/Request/GetHeaderCest.php
index d7d828f3d1b..fbf04e4ae9e 100644
--- a/tests/unit/Http/Request/GetHeaderCest.php
+++ b/tests/unit/Http/Request/GetHeaderCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetHeadersCest.php b/tests/unit/Http/Request/GetHeadersCest.php
index 5e305e161f2..4c1f2a61c37 100644
--- a/tests/unit/Http/Request/GetHeadersCest.php
+++ b/tests/unit/Http/Request/GetHeadersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetHttpHostCest.php b/tests/unit/Http/Request/GetHttpHostCest.php
index 08074b87b5a..c9bb52ce028 100644
--- a/tests/unit/Http/Request/GetHttpHostCest.php
+++ b/tests/unit/Http/Request/GetHttpHostCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Codeception\Example;
 use Phalcon\Http\Request;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnexpectedValueException;
 use UnitTester;
 
diff --git a/tests/unit/Http/Request/GetJsonRawBodyCest.php b/tests/unit/Http/Request/GetJsonRawBodyCest.php
index 30c3d103474..1708204ef4c 100644
--- a/tests/unit/Http/Request/GetJsonRawBodyCest.php
+++ b/tests/unit/Http/Request/GetJsonRawBodyCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Fixtures\Http\PhpStream;
+use Phalcon\Tests\Fixtures\Http\PhpStream;
 use UnitTester;
 
 use function file_put_contents;
diff --git a/tests/unit/Http/Request/GetLanguagesCest.php b/tests/unit/Http/Request/GetLanguagesCest.php
index 9be8b2c5680..fbbfcb03d0d 100644
--- a/tests/unit/Http/Request/GetLanguagesCest.php
+++ b/tests/unit/Http/Request/GetLanguagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetMethodCest.php b/tests/unit/Http/Request/GetMethodCest.php
index dc096497530..66b8116bab2 100644
--- a/tests/unit/Http/Request/GetMethodCest.php
+++ b/tests/unit/Http/Request/GetMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetPortCest.php b/tests/unit/Http/Request/GetPortCest.php
index 3428a4ccd9c..2d17eb65cf8 100644
--- a/tests/unit/Http/Request/GetPortCest.php
+++ b/tests/unit/Http/Request/GetPortCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class GetPortCest extends HttpBase
diff --git a/tests/unit/Http/Request/GetPostCest.php b/tests/unit/Http/Request/GetPostCest.php
index 26b95730361..9ed4b2b1428 100644
--- a/tests/unit/Http/Request/GetPostCest.php
+++ b/tests/unit/Http/Request/GetPostCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetPostCest //extends HttpBase
diff --git a/tests/unit/Http/Request/GetPreferredIsoLocaleVariantCest.php b/tests/unit/Http/Request/GetPreferredIsoLocaleVariantCest.php
index b62535af6df..8a5581b03e5 100644
--- a/tests/unit/Http/Request/GetPreferredIsoLocaleVariantCest.php
+++ b/tests/unit/Http/Request/GetPreferredIsoLocaleVariantCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Codeception\Example;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetPreferredIsoLocaleVariantCest
diff --git a/tests/unit/Http/Request/GetPutCest.php b/tests/unit/Http/Request/GetPutCest.php
index c482188c710..a55fa7fdbfd 100644
--- a/tests/unit/Http/Request/GetPutCest.php
+++ b/tests/unit/Http/Request/GetPutCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Fixtures\Http\PhpStream;
+use Phalcon\Tests\Fixtures\Http\PhpStream;
 use UnitTester;
 
 use function file_get_contents;
diff --git a/tests/unit/Http/Request/GetQueryCest.php b/tests/unit/Http/Request/GetQueryCest.php
index f807347ffe0..502c4180c56 100644
--- a/tests/unit/Http/Request/GetQueryCest.php
+++ b/tests/unit/Http/Request/GetQueryCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetQueryCest
diff --git a/tests/unit/Http/Request/GetRawBodyCest.php b/tests/unit/Http/Request/GetRawBodyCest.php
index 23edb8017b2..95ce99d9e30 100644
--- a/tests/unit/Http/Request/GetRawBodyCest.php
+++ b/tests/unit/Http/Request/GetRawBodyCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Fixtures\Http\PhpStream;
+use Phalcon\Tests\Fixtures\Http\PhpStream;
 use UnitTester;
 
 use function file_put_contents;
diff --git a/tests/unit/Http/Request/GetSchemeCest.php b/tests/unit/Http/Request/GetSchemeCest.php
index 9ccf6ff9f3c..10895df609c 100644
--- a/tests/unit/Http/Request/GetSchemeCest.php
+++ b/tests/unit/Http/Request/GetSchemeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class GetSchemeCest extends HttpBase
diff --git a/tests/unit/Http/Request/GetServerAddressCest.php b/tests/unit/Http/Request/GetServerAddressCest.php
index 3f76196f7d2..1cc646b155b 100644
--- a/tests/unit/Http/Request/GetServerAddressCest.php
+++ b/tests/unit/Http/Request/GetServerAddressCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class GetServerAddressCest extends HttpBase
diff --git a/tests/unit/Http/Request/GetServerCest.php b/tests/unit/Http/Request/GetServerCest.php
index 573e090d870..0c261fc8108 100644
--- a/tests/unit/Http/Request/GetServerCest.php
+++ b/tests/unit/Http/Request/GetServerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetServerNameCest.php b/tests/unit/Http/Request/GetServerNameCest.php
index 59d3b58c558..2341fffee43 100644
--- a/tests/unit/Http/Request/GetServerNameCest.php
+++ b/tests/unit/Http/Request/GetServerNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetSetDICest.php b/tests/unit/Http/Request/GetSetDICest.php
index fd67460264e..51550f443f1 100644
--- a/tests/unit/Http/Request/GetSetDICest.php
+++ b/tests/unit/Http/Request/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Di;
 use Phalcon\Http\Request;
diff --git a/tests/unit/Http/Request/GetSetHttpMethodParameterOverrideCest.php b/tests/unit/Http/Request/GetSetHttpMethodParameterOverrideCest.php
index 354051cf663..b9b9acae758 100644
--- a/tests/unit/Http/Request/GetSetHttpMethodParameterOverrideCest.php
+++ b/tests/unit/Http/Request/GetSetHttpMethodParameterOverrideCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetURICest.php b/tests/unit/Http/Request/GetURICest.php
index adb7e3b2157..aa545c62e81 100644
--- a/tests/unit/Http/Request/GetURICest.php
+++ b/tests/unit/Http/Request/GetURICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetUploadedFilesCest.php b/tests/unit/Http/Request/GetUploadedFilesCest.php
index e275fee5f22..51960aa08a5 100644
--- a/tests/unit/Http/Request/GetUploadedFilesCest.php
+++ b/tests/unit/Http/Request/GetUploadedFilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/GetUserAgentCest.php b/tests/unit/Http/Request/GetUserAgentCest.php
index 3831f9d386f..56c685ec589 100644
--- a/tests/unit/Http/Request/GetUserAgentCest.php
+++ b/tests/unit/Http/Request/GetUserAgentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/HasFilesCest.php b/tests/unit/Http/Request/HasFilesCest.php
index d9b8a57edf7..71a0ddaef01 100644
--- a/tests/unit/Http/Request/HasFilesCest.php
+++ b/tests/unit/Http/Request/HasFilesCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class HasFilesCest extends HttpBase
diff --git a/tests/unit/Http/Request/HasHeaderCest.php b/tests/unit/Http/Request/HasHeaderCest.php
index f4743d1f111..b94d90b95cd 100644
--- a/tests/unit/Http/Request/HasHeaderCest.php
+++ b/tests/unit/Http/Request/HasHeaderCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class HasHeaderCest extends HttpBase
diff --git a/tests/unit/Http/Request/IsCest.php b/tests/unit/Http/Request/IsCest.php
index 14203eb88e4..4a5464b5181 100644
--- a/tests/unit/Http/Request/IsCest.php
+++ b/tests/unit/Http/Request/IsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Codeception\Example;
 use Phalcon\Http\Request;
diff --git a/tests/unit/Http/Request/IsMethodCest.php b/tests/unit/Http/Request/IsMethodCest.php
index 041373e05c0..c1cc0c459de 100644
--- a/tests/unit/Http/Request/IsMethodCest.php
+++ b/tests/unit/Http/Request/IsMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/IsStrictHostCheckCest.php b/tests/unit/Http/Request/IsStrictHostCheckCest.php
index 6557b29000d..6a03dd1898d 100644
--- a/tests/unit/Http/Request/IsStrictHostCheckCest.php
+++ b/tests/unit/Http/Request/IsStrictHostCheckCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class IsStrictHostCheckCest extends HttpBase
diff --git a/tests/unit/Http/Request/IsValidHttpMethodCest.php b/tests/unit/Http/Request/IsValidHttpMethodCest.php
index 7b7452eabde..4c9fc017d5d 100644
--- a/tests/unit/Http/Request/IsValidHttpMethodCest.php
+++ b/tests/unit/Http/Request/IsValidHttpMethodCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Phalcon\Http\Request;
 use UnitTester;
diff --git a/tests/unit/Http/Request/NumFilesCest.php b/tests/unit/Http/Request/NumFilesCest.php
index 2a0bfb10830..1e75e7323b8 100644
--- a/tests/unit/Http/Request/NumFilesCest.php
+++ b/tests/unit/Http/Request/NumFilesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
 use Codeception\Example;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class NumFilesCest extends HttpBase
diff --git a/tests/unit/Http/Request/RequestCest.php b/tests/unit/Http/Request/RequestCest.php
index cd23d625885..1c5bd38dd88 100644
--- a/tests/unit/Http/Request/RequestCest.php
+++ b/tests/unit/Http/Request/RequestCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Request;
+namespace Phalcon\Tests\Unit\Http\Request;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class RequestCest extends HttpBase
diff --git a/tests/unit/Http/Response/AppendContentCest.php b/tests/unit/Http/Response/AppendContentCest.php
index 1cb44f95b31..1dcbfdc9770 100644
--- a/tests/unit/Http/Response/AppendContentCest.php
+++ b/tests/unit/Http/Response/AppendContentCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class AppendContentCest extends HttpBase
diff --git a/tests/unit/Http/Response/ConstructCest.php b/tests/unit/Http/Response/ConstructCest.php
index a4a2c7b7fb6..f8af2c835ce 100644
--- a/tests/unit/Http/Response/ConstructCest.php
+++ b/tests/unit/Http/Response/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use TypeError;
diff --git a/tests/unit/Http/Response/Cookies/ConstructCest.php b/tests/unit/Http/Response/Cookies/ConstructCest.php
index 083511a42f6..78b4fb214c6 100644
--- a/tests/unit/Http/Response/Cookies/ConstructCest.php
+++ b/tests/unit/Http/Response/Cookies/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
 use Phalcon\Http\Response\CookiesInterface;
diff --git a/tests/unit/Http/Response/Cookies/DeleteCest.php b/tests/unit/Http/Response/Cookies/DeleteCest.php
index a1d0ea008d4..04735247eb6 100644
--- a/tests/unit/Http/Response/Cookies/DeleteCest.php
+++ b/tests/unit/Http/Response/Cookies/DeleteCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class DeleteCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/GetCookiesCest.php b/tests/unit/Http/Response/Cookies/GetCookiesCest.php
index b76496ac8b8..ffa8f56d52a 100644
--- a/tests/unit/Http/Response/Cookies/GetCookiesCest.php
+++ b/tests/unit/Http/Response/Cookies/GetCookiesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class GetCookiesCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/GetSetCest.php b/tests/unit/Http/Response/Cookies/GetSetCest.php
index 68ca3c7bd4b..df95befb6f4 100644
--- a/tests/unit/Http/Response/Cookies/GetSetCest.php
+++ b/tests/unit/Http/Response/Cookies/GetSetCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class GetSetCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/GetSetDICest.php b/tests/unit/Http/Response/Cookies/GetSetDICest.php
index 97382e41f24..bb08e66b872 100644
--- a/tests/unit/Http/Response/Cookies/GetSetDICest.php
+++ b/tests/unit/Http/Response/Cookies/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Di;
 use Phalcon\Http\Response\Cookies as ResponseCookies;
diff --git a/tests/unit/Http/Response/Cookies/HasCest.php b/tests/unit/Http/Response/Cookies/HasCest.php
index ed6ee7058d5..6b48ee5efe5 100644
--- a/tests/unit/Http/Response/Cookies/HasCest.php
+++ b/tests/unit/Http/Response/Cookies/HasCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class HasCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/ResetCest.php b/tests/unit/Http/Response/Cookies/ResetCest.php
index c536ebe94eb..40c86fa072d 100644
--- a/tests/unit/Http/Response/Cookies/ResetCest.php
+++ b/tests/unit/Http/Response/Cookies/ResetCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class ResetCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/SendCest.php b/tests/unit/Http/Response/Cookies/SendCest.php
index c6d33eb5b9e..a3bc13e3120 100644
--- a/tests/unit/Http/Response/Cookies/SendCest.php
+++ b/tests/unit/Http/Response/Cookies/SendCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SendCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/SetSignKeyCest.php b/tests/unit/Http/Response/Cookies/SetSignKeyCest.php
index 613ee896c66..25de178575c 100644
--- a/tests/unit/Http/Response/Cookies/SetSignKeyCest.php
+++ b/tests/unit/Http/Response/Cookies/SetSignKeyCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
 use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetSignKeyCest extends HttpBase
diff --git a/tests/unit/Http/Response/Cookies/UseEncryptionIsUsingEncryptionCest.php b/tests/unit/Http/Response/Cookies/UseEncryptionIsUsingEncryptionCest.php
index 7aed93a3853..706a505028e 100644
--- a/tests/unit/Http/Response/Cookies/UseEncryptionIsUsingEncryptionCest.php
+++ b/tests/unit/Http/Response/Cookies/UseEncryptionIsUsingEncryptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Cookies;
+namespace Phalcon\Tests\Unit\Http\Response\Cookies;
 
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\CookieTrait;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Fixtures\Traits\CookieTrait;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class UseEncryptionIsUsingEncryptionCest extends HttpBase
diff --git a/tests/unit/Http/Response/CookiesCest.php b/tests/unit/Http/Response/CookiesCest.php
index fee327f2ad3..f3d5c1fd63d 100644
--- a/tests/unit/Http/Response/CookiesCest.php
+++ b/tests/unit/Http/Response/CookiesCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Di;
 use Phalcon\Http\Cookie;
@@ -9,11 +9,11 @@
 use Phalcon\Http\Response\Cookies;
 use Phalcon\Session\Adapter\Stream as SessionFiles;
 use Phalcon\Session\Manager as SessionManager;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 /**
- * Phalcon\Test\Unit\Http\Response\Http\CookiesTest
+ * Phalcon\Tests\Unit\Http\Response\Http\CookiesTest
  * Tests the Phalcon\Http\Response\Cookies component
  *
  * @copyright (c) 2011-2017 Phalcon Team
diff --git a/tests/unit/Http/Response/GetReasonPhraseCest.php b/tests/unit/Http/Response/GetReasonPhraseCest.php
index 70ed519921e..5ba93cdb104 100644
--- a/tests/unit/Http/Response/GetReasonPhraseCest.php
+++ b/tests/unit/Http/Response/GetReasonPhraseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Response/GetSetContentCest.php b/tests/unit/Http/Response/GetSetContentCest.php
index aad645698cf..3cda375c297 100644
--- a/tests/unit/Http/Response/GetSetContentCest.php
+++ b/tests/unit/Http/Response/GetSetContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Response/GetSetCookiesCest.php b/tests/unit/Http/Response/GetSetCookiesCest.php
index 2546c803044..da6004b50db 100644
--- a/tests/unit/Http/Response/GetSetCookiesCest.php
+++ b/tests/unit/Http/Response/GetSetCookiesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use Phalcon\Http\Response\Cookies;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class GetSetCookiesCest
diff --git a/tests/unit/Http/Response/GetSetDICest.php b/tests/unit/Http/Response/GetSetDICest.php
index 2f620f628d8..f34e1784966 100644
--- a/tests/unit/Http/Response/GetSetDICest.php
+++ b/tests/unit/Http/Response/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Di;
 use Phalcon\Http\Response;
diff --git a/tests/unit/Http/Response/GetSetEventsManagerCest.php b/tests/unit/Http/Response/GetSetEventsManagerCest.php
index 3443c9e90d2..910134f3d1c 100644
--- a/tests/unit/Http/Response/GetSetEventsManagerCest.php
+++ b/tests/unit/Http/Response/GetSetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Events\Manager;
 use Phalcon\Http\Response;
diff --git a/tests/unit/Http/Response/GetSetHeadersCest.php b/tests/unit/Http/Response/GetSetHeadersCest.php
index bb836355f60..60cea57beca 100644
--- a/tests/unit/Http/Response/GetSetHeadersCest.php
+++ b/tests/unit/Http/Response/GetSetHeadersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use Phalcon\Http\Response\Headers;
diff --git a/tests/unit/Http/Response/GetSetStatusCodeCest.php b/tests/unit/Http/Response/GetSetStatusCodeCest.php
index 1351cd3eacc..8432afef145 100644
--- a/tests/unit/Http/Response/GetSetStatusCodeCest.php
+++ b/tests/unit/Http/Response/GetSetStatusCodeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class GetSetStatusCodeCest extends HttpBase
diff --git a/tests/unit/Http/Response/HasHeaderCest.php b/tests/unit/Http/Response/HasHeaderCest.php
index 5e4b5acbb53..47f3354af3c 100644
--- a/tests/unit/Http/Response/HasHeaderCest.php
+++ b/tests/unit/Http/Response/HasHeaderCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class HasHeaderCest extends HttpBase
diff --git a/tests/unit/Http/Response/Headers/GetCest.php b/tests/unit/Http/Response/Headers/GetCest.php
index 9b13d6cef95..81391bd8a50 100644
--- a/tests/unit/Http/Response/Headers/GetCest.php
+++ b/tests/unit/Http/Response/Headers/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/HasCest.php b/tests/unit/Http/Response/Headers/HasCest.php
index dd5b9f5357c..49d8d2b7aa3 100644
--- a/tests/unit/Http/Response/Headers/HasCest.php
+++ b/tests/unit/Http/Response/Headers/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/RemoveCest.php b/tests/unit/Http/Response/Headers/RemoveCest.php
index 4f497829cb4..265499d77a3 100644
--- a/tests/unit/Http/Response/Headers/RemoveCest.php
+++ b/tests/unit/Http/Response/Headers/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/ResetCest.php b/tests/unit/Http/Response/Headers/ResetCest.php
index 8470a49279b..19e19896cfa 100644
--- a/tests/unit/Http/Response/Headers/ResetCest.php
+++ b/tests/unit/Http/Response/Headers/ResetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/SendCest.php b/tests/unit/Http/Response/Headers/SendCest.php
index 677ac6c0208..201c2261824 100644
--- a/tests/unit/Http/Response/Headers/SendCest.php
+++ b/tests/unit/Http/Response/Headers/SendCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/SetCest.php b/tests/unit/Http/Response/Headers/SetCest.php
index 9a491ef9b96..bdbe6c123f2 100644
--- a/tests/unit/Http/Response/Headers/SetCest.php
+++ b/tests/unit/Http/Response/Headers/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/SetRawCest.php b/tests/unit/Http/Response/Headers/SetRawCest.php
index 22cd8e6c48b..a6fee2d8c9b 100644
--- a/tests/unit/Http/Response/Headers/SetRawCest.php
+++ b/tests/unit/Http/Response/Headers/SetRawCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/Headers/ToArrayCest.php b/tests/unit/Http/Response/Headers/ToArrayCest.php
index 6b05356ab02..3606183358a 100644
--- a/tests/unit/Http/Response/Headers/ToArrayCest.php
+++ b/tests/unit/Http/Response/Headers/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response\Headers;
+namespace Phalcon\Tests\Unit\Http\Response\Headers;
 
 use Phalcon\Http\Response\Headers;
 use UnitTester;
diff --git a/tests/unit/Http/Response/HeadersCest.php b/tests/unit/Http/Response/HeadersCest.php
index bef6a8c8af9..66c3fdf510c 100644
--- a/tests/unit/Http/Response/HeadersCest.php
+++ b/tests/unit/Http/Response/HeadersCest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Codeception\Example;
 use Phalcon\Events\Event;
 use Phalcon\Http\Response\Headers;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class HeadersCest extends HttpBase
diff --git a/tests/unit/Http/Response/IsSentCest.php b/tests/unit/Http/Response/IsSentCest.php
index 16de3095957..eebf2109792 100644
--- a/tests/unit/Http/Response/IsSentCest.php
+++ b/tests/unit/Http/Response/IsSentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Response/RedirectCest.php b/tests/unit/Http/Response/RedirectCest.php
index 82a16a86d32..27ae14852b6 100644
--- a/tests/unit/Http/Response/RedirectCest.php
+++ b/tests/unit/Http/Response/RedirectCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class RedirectCest extends HttpBase
diff --git a/tests/unit/Http/Response/RemoveHeaderCest.php b/tests/unit/Http/Response/RemoveHeaderCest.php
index 618e0b0f3c6..f3e4f80f167 100644
--- a/tests/unit/Http/Response/RemoveHeaderCest.php
+++ b/tests/unit/Http/Response/RemoveHeaderCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class RemoveHeaderCest extends HttpBase
diff --git a/tests/unit/Http/Response/ResetHeadersCest.php b/tests/unit/Http/Response/ResetHeadersCest.php
index f4aa259688c..61ae74968f8 100644
--- a/tests/unit/Http/Response/ResetHeadersCest.php
+++ b/tests/unit/Http/Response/ResetHeadersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use Phalcon\Http\Response\Headers;
diff --git a/tests/unit/Http/Response/ResponseCest.php b/tests/unit/Http/Response/ResponseCest.php
index ee0d787f1a6..4ac873f9ca1 100644
--- a/tests/unit/Http/Response/ResponseCest.php
+++ b/tests/unit/Http/Response/ResponseCest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class ResponseCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetCacheCest.php b/tests/unit/Http/Response/SetCacheCest.php
index 1b78bbfa7a3..f092b12d742 100644
--- a/tests/unit/Http/Response/SetCacheCest.php
+++ b/tests/unit/Http/Response/SetCacheCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use DateTime;
 use DateTimeZone;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetCacheCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetContentLengthCest.php b/tests/unit/Http/Response/SetContentLengthCest.php
index 4cb866347a5..2e69b5bc74a 100644
--- a/tests/unit/Http/Response/SetContentLengthCest.php
+++ b/tests/unit/Http/Response/SetContentLengthCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetContentLengthCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetContentTypeCest.php b/tests/unit/Http/Response/SetContentTypeCest.php
index cb825454d51..22d25444c29 100644
--- a/tests/unit/Http/Response/SetContentTypeCest.php
+++ b/tests/unit/Http/Response/SetContentTypeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetContentTypeCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetEtagCest.php b/tests/unit/Http/Response/SetEtagCest.php
index bb43e4b036d..d7f412ecbe3 100644
--- a/tests/unit/Http/Response/SetEtagCest.php
+++ b/tests/unit/Http/Response/SetEtagCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Response/SetExpiresCest.php b/tests/unit/Http/Response/SetExpiresCest.php
index 7ea62a94913..59f12651ade 100644
--- a/tests/unit/Http/Response/SetExpiresCest.php
+++ b/tests/unit/Http/Response/SetExpiresCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use DateTime;
 use DateTimeZone;
diff --git a/tests/unit/Http/Response/SetFileToSendCest.php b/tests/unit/Http/Response/SetFileToSendCest.php
index 7ddc1b73e7f..3f9d49b5d09 100644
--- a/tests/unit/Http/Response/SetFileToSendCest.php
+++ b/tests/unit/Http/Response/SetFileToSendCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetFileToSendCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetHeaderCest.php b/tests/unit/Http/Response/SetHeaderCest.php
index e0672887fbd..5b7d67c9e9e 100644
--- a/tests/unit/Http/Response/SetHeaderCest.php
+++ b/tests/unit/Http/Response/SetHeaderCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetHeaderCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetJsonContentCest.php b/tests/unit/Http/Response/SetJsonContentCest.php
index aaae5d76c1c..931ebf251a8 100644
--- a/tests/unit/Http/Response/SetJsonContentCest.php
+++ b/tests/unit/Http/Response/SetJsonContentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
 use UnitTester;
diff --git a/tests/unit/Http/Response/SetLastModifiedCest.php b/tests/unit/Http/Response/SetLastModifiedCest.php
index 47ca0cb41ee..76348ffc02f 100644
--- a/tests/unit/Http/Response/SetLastModifiedCest.php
+++ b/tests/unit/Http/Response/SetLastModifiedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use DateTime;
 use DateTimeZone;
diff --git a/tests/unit/Http/Response/SetNotModifiedCest.php b/tests/unit/Http/Response/SetNotModifiedCest.php
index 70a122e8ce7..e0a27ed62d0 100644
--- a/tests/unit/Http/Response/SetNotModifiedCest.php
+++ b/tests/unit/Http/Response/SetNotModifiedCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
 use Phalcon\Http\Response;
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetNotModifiedCest extends HttpBase
diff --git a/tests/unit/Http/Response/SetRawHeaderCest.php b/tests/unit/Http/Response/SetRawHeaderCest.php
index a1ecef6de08..1098dd31f58 100644
--- a/tests/unit/Http/Response/SetRawHeaderCest.php
+++ b/tests/unit/Http/Response/SetRawHeaderCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Response;
+namespace Phalcon\Tests\Unit\Http\Response;
 
-use Phalcon\Test\Unit\Http\Helper\HttpBase;
+use Phalcon\Tests\Unit\Http\Helper\HttpBase;
 use UnitTester;
 
 class SetRawHeaderCest extends HttpBase
diff --git a/tests/unit/Http/Server/Middleware/ConstructCest.php b/tests/unit/Http/Server/Middleware/ConstructCest.php
index 0f63242cebf..96c6c4a5dd9 100644
--- a/tests/unit/Http/Server/Middleware/ConstructCest.php
+++ b/tests/unit/Http/Server/Middleware/ConstructCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Server\Middleware;
+namespace Phalcon\Tests\Unit\Http\Server\Middleware;
 
-use Phalcon\Test\Fixtures\Http\Server\MiddlewareFixture;
+use Phalcon\Tests\Fixtures\Http\Server\MiddlewareFixture;
 use Psr\Http\Server\MiddlewareInterface;
 use UnitTester;
 
diff --git a/tests/unit/Http/Server/Middleware/ProcessCest.php b/tests/unit/Http/Server/Middleware/ProcessCest.php
index bf2e735bff7..5159142d3c9 100644
--- a/tests/unit/Http/Server/Middleware/ProcessCest.php
+++ b/tests/unit/Http/Server/Middleware/ProcessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Server\Middleware;
+namespace Phalcon\Tests\Unit\Http\Server\Middleware;
 
 use UnitTester;
 
diff --git a/tests/unit/Http/Server/RequestHandler/ConstructCest.php b/tests/unit/Http/Server/RequestHandler/ConstructCest.php
index d34bf1e520a..e311bfc548b 100644
--- a/tests/unit/Http/Server/RequestHandler/ConstructCest.php
+++ b/tests/unit/Http/Server/RequestHandler/ConstructCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Server\RequestHandler;
+namespace Phalcon\Tests\Unit\Http\Server\RequestHandler;
 
-use Phalcon\Test\Fixtures\Http\Server\RequestHandlerFixture;
+use Phalcon\Tests\Fixtures\Http\Server\RequestHandlerFixture;
 use Psr\Http\Server\RequestHandlerInterface;
 use UnitTester;
 
diff --git a/tests/unit/Http/Server/RequestHandler/HandleCest.php b/tests/unit/Http/Server/RequestHandler/HandleCest.php
index f4f245c55fd..e3a6ab10f02 100644
--- a/tests/unit/Http/Server/RequestHandler/HandleCest.php
+++ b/tests/unit/Http/Server/RequestHandler/HandleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Http\Server\RequestHandler;
+namespace Phalcon\Tests\Unit\Http\Server\RequestHandler;
 
 use UnitTester;
 
diff --git a/tests/unit/Image/Adapter/Gd/BackgroundCest.php b/tests/unit/Image/Adapter/Gd/BackgroundCest.php
index bc97712e8ba..82a4d3601a6 100644
--- a/tests/unit/Image/Adapter/Gd/BackgroundCest.php
+++ b/tests/unit/Image/Adapter/Gd/BackgroundCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
 use Phalcon\Image\Enum;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class BackgroundCest
diff --git a/tests/unit/Image/Adapter/Gd/BlurCest.php b/tests/unit/Image/Adapter/Gd/BlurCest.php
index f8bd53a23b4..452e6b7a139 100644
--- a/tests/unit/Image/Adapter/Gd/BlurCest.php
+++ b/tests/unit/Image/Adapter/Gd/BlurCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class BlurCest
diff --git a/tests/unit/Image/Adapter/Gd/CheckCest.php b/tests/unit/Image/Adapter/Gd/CheckCest.php
index 4a735b7a33e..72624410b53 100644
--- a/tests/unit/Image/Adapter/Gd/CheckCest.php
+++ b/tests/unit/Image/Adapter/Gd/CheckCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class CheckCest
diff --git a/tests/unit/Image/Adapter/Gd/ConstructCest.php b/tests/unit/Image/Adapter/Gd/ConstructCest.php
index 30b1172ef6d..b14e8da7ef8 100644
--- a/tests/unit/Image/Adapter/Gd/ConstructCest.php
+++ b/tests/unit/Image/Adapter/Gd/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Image/Adapter/Gd/CropCest.php b/tests/unit/Image/Adapter/Gd/CropCest.php
index 7d029467b8c..234aa08933b 100644
--- a/tests/unit/Image/Adapter/Gd/CropCest.php
+++ b/tests/unit/Image/Adapter/Gd/CropCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class CropCest
diff --git a/tests/unit/Image/Adapter/Gd/DestructCest.php b/tests/unit/Image/Adapter/Gd/DestructCest.php
index edf36a2f110..f22a8d5171b 100644
--- a/tests/unit/Image/Adapter/Gd/DestructCest.php
+++ b/tests/unit/Image/Adapter/Gd/DestructCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class DestructCest
diff --git a/tests/unit/Image/Adapter/Gd/FlipCest.php b/tests/unit/Image/Adapter/Gd/FlipCest.php
index d09321384ed..5f5eb3677e6 100644
--- a/tests/unit/Image/Adapter/Gd/FlipCest.php
+++ b/tests/unit/Image/Adapter/Gd/FlipCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
 use Phalcon\Image\Enum;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class FlipCest
diff --git a/tests/unit/Image/Adapter/Gd/GetHeightCest.php b/tests/unit/Image/Adapter/Gd/GetHeightCest.php
index 8f199c97fb1..75ce092bdb9 100644
--- a/tests/unit/Image/Adapter/Gd/GetHeightCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetHeightCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetHeightCest
diff --git a/tests/unit/Image/Adapter/Gd/GetImageCest.php b/tests/unit/Image/Adapter/Gd/GetImageCest.php
index 847e2674344..540f86ce997 100644
--- a/tests/unit/Image/Adapter/Gd/GetImageCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetImageCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetImageCest
diff --git a/tests/unit/Image/Adapter/Gd/GetMimeCest.php b/tests/unit/Image/Adapter/Gd/GetMimeCest.php
index c51f6429064..a4c22e51bef 100644
--- a/tests/unit/Image/Adapter/Gd/GetMimeCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetMimeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetMimeCest
diff --git a/tests/unit/Image/Adapter/Gd/GetRealpathCest.php b/tests/unit/Image/Adapter/Gd/GetRealpathCest.php
index a63a43f3298..c2099abacf8 100644
--- a/tests/unit/Image/Adapter/Gd/GetRealpathCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetRealpathCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetRealpathCest
diff --git a/tests/unit/Image/Adapter/Gd/GetTypeCest.php b/tests/unit/Image/Adapter/Gd/GetTypeCest.php
index 4d3959a322b..202ac3f4a9c 100644
--- a/tests/unit/Image/Adapter/Gd/GetTypeCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetTypeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetTypeCest
diff --git a/tests/unit/Image/Adapter/Gd/GetVersionCest.php b/tests/unit/Image/Adapter/Gd/GetVersionCest.php
index ec5b52f9dc2..99bb24cd364 100644
--- a/tests/unit/Image/Adapter/Gd/GetVersionCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetVersionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetVersionCest
diff --git a/tests/unit/Image/Adapter/Gd/GetWidthCest.php b/tests/unit/Image/Adapter/Gd/GetWidthCest.php
index 1b720c18fd1..eca3dd39d98 100644
--- a/tests/unit/Image/Adapter/Gd/GetWidthCest.php
+++ b/tests/unit/Image/Adapter/Gd/GetWidthCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class GetWidthCest
diff --git a/tests/unit/Image/Adapter/Gd/LiquidRescaleCest.php b/tests/unit/Image/Adapter/Gd/LiquidRescaleCest.php
index 15b2dd1b9d9..63d349e31e3 100644
--- a/tests/unit/Image/Adapter/Gd/LiquidRescaleCest.php
+++ b/tests/unit/Image/Adapter/Gd/LiquidRescaleCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class LiquidRescaleCest
diff --git a/tests/unit/Image/Adapter/Gd/MaskCest.php b/tests/unit/Image/Adapter/Gd/MaskCest.php
index f861d64c7c4..210f8f5dc81 100644
--- a/tests/unit/Image/Adapter/Gd/MaskCest.php
+++ b/tests/unit/Image/Adapter/Gd/MaskCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class MaskCest
diff --git a/tests/unit/Image/Adapter/Gd/PixelateCest.php b/tests/unit/Image/Adapter/Gd/PixelateCest.php
index 93aa8d4e2cd..dcc30a75a7a 100644
--- a/tests/unit/Image/Adapter/Gd/PixelateCest.php
+++ b/tests/unit/Image/Adapter/Gd/PixelateCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class PixelateCest
diff --git a/tests/unit/Image/Adapter/Gd/ReflectionCest.php b/tests/unit/Image/Adapter/Gd/ReflectionCest.php
index 569af96be50..beeaa07445d 100644
--- a/tests/unit/Image/Adapter/Gd/ReflectionCest.php
+++ b/tests/unit/Image/Adapter/Gd/ReflectionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class ReflectionCest
diff --git a/tests/unit/Image/Adapter/Gd/RenderCest.php b/tests/unit/Image/Adapter/Gd/RenderCest.php
index e7f7651ca3a..3864fb47468 100644
--- a/tests/unit/Image/Adapter/Gd/RenderCest.php
+++ b/tests/unit/Image/Adapter/Gd/RenderCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class RenderCest
diff --git a/tests/unit/Image/Adapter/Gd/ResizeCest.php b/tests/unit/Image/Adapter/Gd/ResizeCest.php
index d9ea9d3f57b..22276b7c9de 100644
--- a/tests/unit/Image/Adapter/Gd/ResizeCest.php
+++ b/tests/unit/Image/Adapter/Gd/ResizeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class ResizeCest
diff --git a/tests/unit/Image/Adapter/Gd/RotateCest.php b/tests/unit/Image/Adapter/Gd/RotateCest.php
index 0fb23bf3ba1..6b2a4060995 100644
--- a/tests/unit/Image/Adapter/Gd/RotateCest.php
+++ b/tests/unit/Image/Adapter/Gd/RotateCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class RotateCest
diff --git a/tests/unit/Image/Adapter/Gd/SaveCest.php b/tests/unit/Image/Adapter/Gd/SaveCest.php
index 4361c5e95bf..34229bb6389 100644
--- a/tests/unit/Image/Adapter/Gd/SaveCest.php
+++ b/tests/unit/Image/Adapter/Gd/SaveCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class SaveCest
diff --git a/tests/unit/Image/Adapter/Gd/SharpenCest.php b/tests/unit/Image/Adapter/Gd/SharpenCest.php
index ca0220be866..79d68cc4054 100644
--- a/tests/unit/Image/Adapter/Gd/SharpenCest.php
+++ b/tests/unit/Image/Adapter/Gd/SharpenCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class SharpenCest
diff --git a/tests/unit/Image/Adapter/Gd/TextCest.php b/tests/unit/Image/Adapter/Gd/TextCest.php
index ba7779abde5..24996299ac6 100644
--- a/tests/unit/Image/Adapter/Gd/TextCest.php
+++ b/tests/unit/Image/Adapter/Gd/TextCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Codeception\Example;
 use Phalcon\Image\Adapter\Gd;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Gd/WatermarkCest.php b/tests/unit/Image/Adapter/Gd/WatermarkCest.php
index 011d6ef0f3f..29991a00ba4 100644
--- a/tests/unit/Image/Adapter/Gd/WatermarkCest.php
+++ b/tests/unit/Image/Adapter/Gd/WatermarkCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Gd;
+namespace Phalcon\Tests\Unit\Image\Adapter\Gd;
 
 use Phalcon\Image\Adapter\Gd;
 use Phalcon\Image\Enum;
-use Phalcon\Test\Fixtures\Traits\GdTrait;
+use Phalcon\Tests\Fixtures\Traits\GdTrait;
 use UnitTester;
 
 class WatermarkCest
diff --git a/tests/unit/Image/Adapter/Imagick/BackgroundCest.php b/tests/unit/Image/Adapter/Imagick/BackgroundCest.php
index c5c583f2a27..e3adc2561e7 100644
--- a/tests/unit/Image/Adapter/Imagick/BackgroundCest.php
+++ b/tests/unit/Image/Adapter/Imagick/BackgroundCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/BlurCest.php b/tests/unit/Image/Adapter/Imagick/BlurCest.php
index 46c801d3122..fcbe7b20818 100644
--- a/tests/unit/Image/Adapter/Imagick/BlurCest.php
+++ b/tests/unit/Image/Adapter/Imagick/BlurCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class BlurCest
diff --git a/tests/unit/Image/Adapter/Imagick/CheckCest.php b/tests/unit/Image/Adapter/Imagick/CheckCest.php
index e2e5b0e25f6..67b800a2c81 100644
--- a/tests/unit/Image/Adapter/Imagick/CheckCest.php
+++ b/tests/unit/Image/Adapter/Imagick/CheckCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class CheckCest
diff --git a/tests/unit/Image/Adapter/Imagick/CropCest.php b/tests/unit/Image/Adapter/Imagick/CropCest.php
index 93abea772b2..2b1c2780f31 100644
--- a/tests/unit/Image/Adapter/Imagick/CropCest.php
+++ b/tests/unit/Image/Adapter/Imagick/CropCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/FlipCest.php b/tests/unit/Image/Adapter/Imagick/FlipCest.php
index 751f2e082c8..b8d907dfdde 100644
--- a/tests/unit/Image/Adapter/Imagick/FlipCest.php
+++ b/tests/unit/Image/Adapter/Imagick/FlipCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
 use Phalcon\Image\Enum;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/GetImageCest.php b/tests/unit/Image/Adapter/Imagick/GetImageCest.php
index 9bfbed01f5c..87f07168512 100644
--- a/tests/unit/Image/Adapter/Imagick/GetImageCest.php
+++ b/tests/unit/Image/Adapter/Imagick/GetImageCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class GetImageCest
diff --git a/tests/unit/Image/Adapter/Imagick/GetInternalImInstanceCest.php b/tests/unit/Image/Adapter/Imagick/GetInternalImInstanceCest.php
index 0311a7817f6..827f11447c8 100644
--- a/tests/unit/Image/Adapter/Imagick/GetInternalImInstanceCest.php
+++ b/tests/unit/Image/Adapter/Imagick/GetInternalImInstanceCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class GetInternalImInstanceCest
diff --git a/tests/unit/Image/Adapter/Imagick/GetMimeCest.php b/tests/unit/Image/Adapter/Imagick/GetMimeCest.php
index 7d334906ef7..d5603592195 100644
--- a/tests/unit/Image/Adapter/Imagick/GetMimeCest.php
+++ b/tests/unit/Image/Adapter/Imagick/GetMimeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class GetMimeCest
diff --git a/tests/unit/Image/Adapter/Imagick/GetRealpathCest.php b/tests/unit/Image/Adapter/Imagick/GetRealpathCest.php
index ed3c11f7d3b..84b0885ba12 100644
--- a/tests/unit/Image/Adapter/Imagick/GetRealpathCest.php
+++ b/tests/unit/Image/Adapter/Imagick/GetRealpathCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class GetRealpathCest
diff --git a/tests/unit/Image/Adapter/Imagick/GetTypeCest.php b/tests/unit/Image/Adapter/Imagick/GetTypeCest.php
index 8b903665a06..21532d3b00f 100644
--- a/tests/unit/Image/Adapter/Imagick/GetTypeCest.php
+++ b/tests/unit/Image/Adapter/Imagick/GetTypeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class GetTypeCest
diff --git a/tests/unit/Image/Adapter/Imagick/LiquidRescaleCest.php b/tests/unit/Image/Adapter/Imagick/LiquidRescaleCest.php
index 4a934507b7d..d431a8bb7e9 100644
--- a/tests/unit/Image/Adapter/Imagick/LiquidRescaleCest.php
+++ b/tests/unit/Image/Adapter/Imagick/LiquidRescaleCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/MaskCest.php b/tests/unit/Image/Adapter/Imagick/MaskCest.php
index 7b1c6356f44..3c7397eccae 100644
--- a/tests/unit/Image/Adapter/Imagick/MaskCest.php
+++ b/tests/unit/Image/Adapter/Imagick/MaskCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/PixelateCest.php b/tests/unit/Image/Adapter/Imagick/PixelateCest.php
index 6b7e1c4b853..f5b996d978d 100644
--- a/tests/unit/Image/Adapter/Imagick/PixelateCest.php
+++ b/tests/unit/Image/Adapter/Imagick/PixelateCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class PixelateCest
diff --git a/tests/unit/Image/Adapter/Imagick/ReflectionCest.php b/tests/unit/Image/Adapter/Imagick/ReflectionCest.php
index c5429b4666b..a5693ca82be 100644
--- a/tests/unit/Image/Adapter/Imagick/ReflectionCest.php
+++ b/tests/unit/Image/Adapter/Imagick/ReflectionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/RenderCest.php b/tests/unit/Image/Adapter/Imagick/RenderCest.php
index 98fca044a7d..e22d1324e54 100644
--- a/tests/unit/Image/Adapter/Imagick/RenderCest.php
+++ b/tests/unit/Image/Adapter/Imagick/RenderCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 class RenderCest
diff --git a/tests/unit/Image/Adapter/Imagick/ResizeCest.php b/tests/unit/Image/Adapter/Imagick/ResizeCest.php
index 6751043a447..d3f0f14e8c2 100644
--- a/tests/unit/Image/Adapter/Imagick/ResizeCest.php
+++ b/tests/unit/Image/Adapter/Imagick/ResizeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/RotateCest.php b/tests/unit/Image/Adapter/Imagick/RotateCest.php
index 3fe725a93e2..5ddfea6f14b 100644
--- a/tests/unit/Image/Adapter/Imagick/RotateCest.php
+++ b/tests/unit/Image/Adapter/Imagick/RotateCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/SaveCest.php b/tests/unit/Image/Adapter/Imagick/SaveCest.php
index fcff1db5110..255184abc1a 100644
--- a/tests/unit/Image/Adapter/Imagick/SaveCest.php
+++ b/tests/unit/Image/Adapter/Imagick/SaveCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function outputDir;
diff --git a/tests/unit/Image/Adapter/Imagick/SetResourceLimitCest.php b/tests/unit/Image/Adapter/Imagick/SetResourceLimitCest.php
index a2794129fab..35d20ee08cc 100644
--- a/tests/unit/Image/Adapter/Imagick/SetResourceLimitCest.php
+++ b/tests/unit/Image/Adapter/Imagick/SetResourceLimitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use UnitTester;
 
diff --git a/tests/unit/Image/Adapter/Imagick/SharpenCest.php b/tests/unit/Image/Adapter/Imagick/SharpenCest.php
index f2ee9c2806b..192e16a6bb3 100644
--- a/tests/unit/Image/Adapter/Imagick/SharpenCest.php
+++ b/tests/unit/Image/Adapter/Imagick/SharpenCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/TextCest.php b/tests/unit/Image/Adapter/Imagick/TextCest.php
index c9aec5684a8..c83a9acec0b 100644
--- a/tests/unit/Image/Adapter/Imagick/TextCest.php
+++ b/tests/unit/Image/Adapter/Imagick/TextCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/Adapter/Imagick/WatermarkCest.php b/tests/unit/Image/Adapter/Imagick/WatermarkCest.php
index ce3b008b9ba..fda5053c4ab 100644
--- a/tests/unit/Image/Adapter/Imagick/WatermarkCest.php
+++ b/tests/unit/Image/Adapter/Imagick/WatermarkCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\Adapter\Imagick;
+namespace Phalcon\Tests\Unit\Image\Adapter\Imagick;
 
 use Phalcon\Image\Adapter\Imagick;
-use Phalcon\Test\Fixtures\Traits\ImagickTrait;
+use Phalcon\Tests\Fixtures\Traits\ImagickTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Image/ImageFactory/LoadCest.php b/tests/unit/Image/ImageFactory/LoadCest.php
index 6fc37f672cd..1fac61df0af 100644
--- a/tests/unit/Image/ImageFactory/LoadCest.php
+++ b/tests/unit/Image/ImageFactory/LoadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\ImageFactory;
+namespace Phalcon\Tests\Unit\Image\ImageFactory;
 
 use Phalcon\Image\Adapter\Imagick;
 use Phalcon\Image\ImageFactory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 use UnitTester;
 
 class LoadCest
diff --git a/tests/unit/Image/ImageFactory/NewInstanceCest.php b/tests/unit/Image/ImageFactory/NewInstanceCest.php
index fa67d840506..15a006c84cf 100644
--- a/tests/unit/Image/ImageFactory/NewInstanceCest.php
+++ b/tests/unit/Image/ImageFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Image\ImageFactory;
+namespace Phalcon\Tests\Unit\Image\ImageFactory;
 
 use Phalcon\Image\Adapter\Imagick;
 use Phalcon\Image\ImageFactory;
diff --git a/tests/unit/Kernel/PreComputeHashKeyCest.php b/tests/unit/Kernel/PreComputeHashKeyCest.php
index 7e3dd5d0902..be8aced22d1 100644
--- a/tests/unit/Kernel/PreComputeHashKeyCest.php
+++ b/tests/unit/Kernel/PreComputeHashKeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Kernel;
+namespace Phalcon\Tests\Unit\Kernel;
 
 use UnitTester;
 
diff --git a/tests/unit/Loader/GetClassesCest.php b/tests/unit/Loader/GetClassesCest.php
index d3470349a47..f4c1e93c9c8 100644
--- a/tests/unit/Loader/GetClassesCest.php
+++ b/tests/unit/Loader/GetClassesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Loader;
 use UnitTester;
diff --git a/tests/unit/Loader/GetDirsCest.php b/tests/unit/Loader/GetDirsCest.php
index 553828bfce8..730c080e466 100644
--- a/tests/unit/Loader/GetDirsCest.php
+++ b/tests/unit/Loader/GetDirsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Loader;
 use UnitTester;
diff --git a/tests/unit/Loader/GetExtensionsCest.php b/tests/unit/Loader/GetExtensionsCest.php
index 49514f1fddf..1fa2bab1bd6 100644
--- a/tests/unit/Loader/GetExtensionsCest.php
+++ b/tests/unit/Loader/GetExtensionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use UnitTester;
 
diff --git a/tests/unit/Loader/GetFilesCest.php b/tests/unit/Loader/GetFilesCest.php
index d9c643a95aa..933c4657331 100644
--- a/tests/unit/Loader/GetFilesCest.php
+++ b/tests/unit/Loader/GetFilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Loader;
 use UnitTester;
diff --git a/tests/unit/Loader/GetFoundPathCest.php b/tests/unit/Loader/GetFoundPathCest.php
index 2164a625c53..c3dbed2bfe2 100644
--- a/tests/unit/Loader/GetFoundPathCest.php
+++ b/tests/unit/Loader/GetFoundPathCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use UnitTester;
 
diff --git a/tests/unit/Loader/GetNamespacesCest.php b/tests/unit/Loader/GetNamespacesCest.php
index 058dd18ee4f..48fc33a0f22 100644
--- a/tests/unit/Loader/GetNamespacesCest.php
+++ b/tests/unit/Loader/GetNamespacesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Loader;
 use UnitTester;
diff --git a/tests/unit/Loader/GetSetEventsManagerCest.php b/tests/unit/Loader/GetSetEventsManagerCest.php
index 91ff4245fd7..e0614979755 100644
--- a/tests/unit/Loader/GetSetEventsManagerCest.php
+++ b/tests/unit/Loader/GetSetEventsManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Events\Manager;
 use Phalcon\Loader;
diff --git a/tests/unit/Loader/LoadFilesCest.php b/tests/unit/Loader/LoadFilesCest.php
index c07b5c3a862..68d52293aba 100644
--- a/tests/unit/Loader/LoadFilesCest.php
+++ b/tests/unit/Loader/LoadFilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use UnitTester;
 
diff --git a/tests/unit/Loader/LoaderCest.php b/tests/unit/Loader/LoaderCest.php
index 57ff0de9f77..95ec30c91d5 100644
--- a/tests/unit/Loader/LoaderCest.php
+++ b/tests/unit/Loader/LoaderCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use LoaderEvent;
 use Phalcon\Events\Event;
 use Phalcon\Events\Manager;
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Loader/RegisterClassesCest.php b/tests/unit/Loader/RegisterClassesCest.php
index a8b9a4da004..e2448aba797 100644
--- a/tests/unit/Loader/RegisterClassesCest.php
+++ b/tests/unit/Loader/RegisterClassesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use One;
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use Two;
 use UnitTester;
 
diff --git a/tests/unit/Loader/RegisterDirsCest.php b/tests/unit/Loader/RegisterDirsCest.php
index 7bc8c18a314..bfba40f1cb9 100644
--- a/tests/unit/Loader/RegisterDirsCest.php
+++ b/tests/unit/Loader/RegisterDirsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Integer;
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use Sqlite;
 use UnitTester;
 
diff --git a/tests/unit/Loader/RegisterFilesCest.php b/tests/unit/Loader/RegisterFilesCest.php
index 85d1e94dd31..5fb90373840 100644
--- a/tests/unit/Loader/RegisterFilesCest.php
+++ b/tests/unit/Loader/RegisterFilesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Loader/RegisterNamespacesCest.php b/tests/unit/Loader/RegisterNamespacesCest.php
index a25fcca9fe9..9098a3ba120 100644
--- a/tests/unit/Loader/RegisterNamespacesCest.php
+++ b/tests/unit/Loader/RegisterNamespacesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Example\Namespaces\Adapter\Another;
 use Example\Namespaces\Adapter\Mongo;
@@ -19,7 +19,7 @@
 use Example\Namespaces\Engines\Gasoline;
 use Example\Namespaces\Example\Example;
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Loader/SetExtensionsCest.php b/tests/unit/Loader/SetExtensionsCest.php
index d9dd411c25a..e531e32ca44 100644
--- a/tests/unit/Loader/SetExtensionsCest.php
+++ b/tests/unit/Loader/SetExtensionsCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Example\Namespaces\Engines\Alcohol;
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Loader/SetFileCheckingCallbackCest.php b/tests/unit/Loader/SetFileCheckingCallbackCest.php
index 743c9c97673..586e01a9b27 100644
--- a/tests/unit/Loader/SetFileCheckingCallbackCest.php
+++ b/tests/unit/Loader/SetFileCheckingCallbackCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use Phalcon\Loader;
-use Phalcon\Test\Fixtures\Traits\LoaderTrait;
+use Phalcon\Tests\Fixtures\Traits\LoaderTrait;
 use UnitTester;
 
 use function dataDir;
diff --git a/tests/unit/Loader/UnregisterCest.php b/tests/unit/Loader/UnregisterCest.php
index 8f3a404566e..dfc0ceec9ed 100644
--- a/tests/unit/Loader/UnregisterCest.php
+++ b/tests/unit/Loader/UnregisterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Loader;
+namespace Phalcon\Tests\Unit\Loader;
 
 use UnitTester;
 
diff --git a/tests/unit/Logger/Adapter/Noop/AddCest.php b/tests/unit/Logger/Adapter/Noop/AddCest.php
index 8900f026553..7228f062f7e 100644
--- a/tests/unit/Logger/Adapter/Noop/AddCest.php
+++ b/tests/unit/Logger/Adapter/Noop/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Adapter/Noop/BeginCest.php b/tests/unit/Logger/Adapter/Noop/BeginCest.php
index 89603ac6ce8..e6ab64a08d9 100644
--- a/tests/unit/Logger/Adapter/Noop/BeginCest.php
+++ b/tests/unit/Logger/Adapter/Noop/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Noop/CloseCest.php b/tests/unit/Logger/Adapter/Noop/CloseCest.php
index af58d578832..9629d5c9c95 100644
--- a/tests/unit/Logger/Adapter/Noop/CloseCest.php
+++ b/tests/unit/Logger/Adapter/Noop/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Noop/CommitCest.php b/tests/unit/Logger/Adapter/Noop/CommitCest.php
index 25678c0f08f..72cf8dd3942 100644
--- a/tests/unit/Logger/Adapter/Noop/CommitCest.php
+++ b/tests/unit/Logger/Adapter/Noop/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Noop/GetSetFormatterCest.php b/tests/unit/Logger/Adapter/Noop/GetSetFormatterCest.php
index 1c02bde1793..3d5380c29af 100644
--- a/tests/unit/Logger/Adapter/Noop/GetSetFormatterCest.php
+++ b/tests/unit/Logger/Adapter/Noop/GetSetFormatterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use Phalcon\Logger\Formatter\FormatterInterface;
diff --git a/tests/unit/Logger/Adapter/Noop/InTransactionCest.php b/tests/unit/Logger/Adapter/Noop/InTransactionCest.php
index 00a8fc95c7c..0cf26ee9e5b 100644
--- a/tests/unit/Logger/Adapter/Noop/InTransactionCest.php
+++ b/tests/unit/Logger/Adapter/Noop/InTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Noop/ProcessCest.php b/tests/unit/Logger/Adapter/Noop/ProcessCest.php
index f49fa88f6f6..a54ca511b21 100644
--- a/tests/unit/Logger/Adapter/Noop/ProcessCest.php
+++ b/tests/unit/Logger/Adapter/Noop/ProcessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Adapter/Noop/RollbackCest.php b/tests/unit/Logger/Adapter/Noop/RollbackCest.php
index 5a93f1c5def..d041233b976 100644
--- a/tests/unit/Logger/Adapter/Noop/RollbackCest.php
+++ b/tests/unit/Logger/Adapter/Noop/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php
index f66c7672707..2274c56b141 100644
--- a/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
 
 use Phalcon\Logger\Adapter\Noop;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Stream/AddCest.php b/tests/unit/Logger/Adapter/Stream/AddCest.php
index 46647805f29..f8b16a7dd02 100644
--- a/tests/unit/Logger/Adapter/Stream/AddCest.php
+++ b/tests/unit/Logger/Adapter/Stream/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Adapter/Stream/BeginCest.php b/tests/unit/Logger/Adapter/Stream/BeginCest.php
index dc62f5b174a..01218b047bd 100644
--- a/tests/unit/Logger/Adapter/Stream/BeginCest.php
+++ b/tests/unit/Logger/Adapter/Stream/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Stream;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Stream/CloseCest.php b/tests/unit/Logger/Adapter/Stream/CloseCest.php
index fc65ce4d824..e13d35057e1 100644
--- a/tests/unit/Logger/Adapter/Stream/CloseCest.php
+++ b/tests/unit/Logger/Adapter/Stream/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Adapter/Stream/CommitCest.php b/tests/unit/Logger/Adapter/Stream/CommitCest.php
index 785c1e2ca1d..87087e8d170 100644
--- a/tests/unit/Logger/Adapter/Stream/CommitCest.php
+++ b/tests/unit/Logger/Adapter/Stream/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Stream;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Stream/GetNameCest.php b/tests/unit/Logger/Adapter/Stream/GetNameCest.php
index 1c69287ab03..0d831e792ef 100644
--- a/tests/unit/Logger/Adapter/Stream/GetNameCest.php
+++ b/tests/unit/Logger/Adapter/Stream/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Stream;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Stream/GetSetFormatterCest.php b/tests/unit/Logger/Adapter/Stream/GetSetFormatterCest.php
index 69e4461fbaa..76768d31ead 100644
--- a/tests/unit/Logger/Adapter/Stream/GetSetFormatterCest.php
+++ b/tests/unit/Logger/Adapter/Stream/GetSetFormatterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Stream;
 use Phalcon\Logger\Formatter\FormatterInterface;
diff --git a/tests/unit/Logger/Adapter/Stream/InTransactionCest.php b/tests/unit/Logger/Adapter/Stream/InTransactionCest.php
index 4b242dab463..9feef974915 100644
--- a/tests/unit/Logger/Adapter/Stream/InTransactionCest.php
+++ b/tests/unit/Logger/Adapter/Stream/InTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Stream;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Stream/ProcessCest.php b/tests/unit/Logger/Adapter/Stream/ProcessCest.php
index c3e7ec203a1..b6b06ab7554 100644
--- a/tests/unit/Logger/Adapter/Stream/ProcessCest.php
+++ b/tests/unit/Logger/Adapter/Stream/ProcessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Adapter/Stream/RollbackCest.php b/tests/unit/Logger/Adapter/Stream/RollbackCest.php
index 009cb5b0bfe..cdf9872e740 100644
--- a/tests/unit/Logger/Adapter/Stream/RollbackCest.php
+++ b/tests/unit/Logger/Adapter/Stream/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Stream;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
index a1bdf51c1d9..0a0ed050dd8 100644
--- a/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
 
 use Phalcon\Logger\Adapter\Noop;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Adapter/Syslog/AddCest.php b/tests/unit/Logger/Adapter/Syslog/AddCest.php
index 1bc701a95b6..bd9bc98b4e3 100644
--- a/tests/unit/Logger/Adapter/Syslog/AddCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/AddCest.php
@@ -16,7 +16,7 @@
  *       tests in this namespace
  */
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog {
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog {
     function syslog($level, $message)
     {
     }
diff --git a/tests/unit/Logger/Adapter/Syslog/BeginCest.php b/tests/unit/Logger/Adapter/Syslog/BeginCest.php
index c1e8e4e810b..a5d75917327 100644
--- a/tests/unit/Logger/Adapter/Syslog/BeginCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/BeginCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Syslog;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Syslog/CloseCest.php b/tests/unit/Logger/Adapter/Syslog/CloseCest.php
index f92bac85e85..3676bae10e1 100644
--- a/tests/unit/Logger/Adapter/Syslog/CloseCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/CloseCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Syslog;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Syslog/CommitCest.php b/tests/unit/Logger/Adapter/Syslog/CommitCest.php
index 2076fea13ed..81a06824f94 100644
--- a/tests/unit/Logger/Adapter/Syslog/CommitCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/CommitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Syslog;
 use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Syslog/ConstructCest.php b/tests/unit/Logger/Adapter/Syslog/ConstructCest.php
index 50db704b742..81b9fc00f75 100644
--- a/tests/unit/Logger/Adapter/Syslog/ConstructCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Codeception\Example;
 use Phalcon\Logger\Adapter\Syslog;
diff --git a/tests/unit/Logger/Adapter/Syslog/GetSetFormatterCest.php b/tests/unit/Logger/Adapter/Syslog/GetSetFormatterCest.php
index 97a441e8cd1..7d84b2f890d 100644
--- a/tests/unit/Logger/Adapter/Syslog/GetSetFormatterCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/GetSetFormatterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Syslog;
 use Phalcon\Logger\Formatter\FormatterInterface;
diff --git a/tests/unit/Logger/Adapter/Syslog/InTransactionCest.php b/tests/unit/Logger/Adapter/Syslog/InTransactionCest.php
index 27ecb801834..1aff054c96d 100644
--- a/tests/unit/Logger/Adapter/Syslog/InTransactionCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/InTransactionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Syslog;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Syslog/ProcessCest.php b/tests/unit/Logger/Adapter/Syslog/ProcessCest.php
index c1ea8e35ff8..dfb7ade02be 100644
--- a/tests/unit/Logger/Adapter/Syslog/ProcessCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/ProcessCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Adapter/Syslog/RollbackCest.php b/tests/unit/Logger/Adapter/Syslog/RollbackCest.php
index 220538f7972..92fbb3fa580 100644
--- a/tests/unit/Logger/Adapter/Syslog/RollbackCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/RollbackCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Syslog;
 use UnitTester;
diff --git a/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php
index 851ea6160d1..983a2299a70 100644
--- a/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
 
 use Phalcon\Logger\Adapter\Noop;
 use Phalcon\Logger\Adapter\Syslog;
diff --git a/tests/unit/Logger/AdapterFactory/NewInstanceCest.php b/tests/unit/Logger/AdapterFactory/NewInstanceCest.php
index e4ca1264f17..5f319bf1ef6 100644
--- a/tests/unit/Logger/AdapterFactory/NewInstanceCest.php
+++ b/tests/unit/Logger/AdapterFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\AdapterFactory;
+namespace Phalcon\Tests\Unit\Logger\AdapterFactory;
 
 use Phalcon\Logger\Exception;
 use Phalcon\Logger\Adapter\AdapterInterface;
diff --git a/tests/unit/Logger/Formatter/Json/FormatCest.php b/tests/unit/Logger/Formatter/Json/FormatCest.php
index b965b42c1cb..5ef360f3377 100644
--- a/tests/unit/Logger/Formatter/Json/FormatCest.php
+++ b/tests/unit/Logger/Formatter/Json/FormatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Formatter\Json;
+namespace Phalcon\Tests\Unit\Logger\Formatter\Json;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Formatter/Json/GetSetDateFormatCest.php b/tests/unit/Logger/Formatter/Json/GetSetDateFormatCest.php
index 2d116ee938e..123a04dcf48 100644
--- a/tests/unit/Logger/Formatter/Json/GetSetDateFormatCest.php
+++ b/tests/unit/Logger/Formatter/Json/GetSetDateFormatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Formatter\Json;
+namespace Phalcon\Tests\Unit\Logger\Formatter\Json;
 
 use Phalcon\Logger\Formatter\Json;
 use UnitTester;
diff --git a/tests/unit/Logger/Formatter/Line/FormatCest.php b/tests/unit/Logger/Formatter/Line/FormatCest.php
index c2d4759c286..da336a92b24 100644
--- a/tests/unit/Logger/Formatter/Line/FormatCest.php
+++ b/tests/unit/Logger/Formatter/Line/FormatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Formatter\Line;
+namespace Phalcon\Tests\Unit\Logger\Formatter\Line;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Formatter/Line/GetSetDateFormatCest.php b/tests/unit/Logger/Formatter/Line/GetSetDateFormatCest.php
index 9c9e0675ea2..283385683d9 100644
--- a/tests/unit/Logger/Formatter/Line/GetSetDateFormatCest.php
+++ b/tests/unit/Logger/Formatter/Line/GetSetDateFormatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Formatter\Line;
+namespace Phalcon\Tests\Unit\Logger\Formatter\Line;
 
 use Phalcon\Logger\Formatter\Line;
 use UnitTester;
diff --git a/tests/unit/Logger/Formatter/Line/GetSetFormatCest.php b/tests/unit/Logger/Formatter/Line/GetSetFormatCest.php
index 44bf29a12f9..5d6162eba90 100644
--- a/tests/unit/Logger/Formatter/Line/GetSetFormatCest.php
+++ b/tests/unit/Logger/Formatter/Line/GetSetFormatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Formatter\Line;
+namespace Phalcon\Tests\Unit\Logger\Formatter\Line;
 
 use Phalcon\Logger\Formatter\Line;
 use UnitTester;
diff --git a/tests/unit/Logger/Item/GetContextCest.php b/tests/unit/Logger/Item/GetContextCest.php
index fb47c282832..1f028722620 100644
--- a/tests/unit/Logger/Item/GetContextCest.php
+++ b/tests/unit/Logger/Item/GetContextCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Item;
+namespace Phalcon\Tests\Unit\Logger\Item;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Item/GetLevelCest.php b/tests/unit/Logger/Item/GetLevelCest.php
index f5fc256a37e..2904ecaa14d 100644
--- a/tests/unit/Logger/Item/GetLevelCest.php
+++ b/tests/unit/Logger/Item/GetLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Item;
+namespace Phalcon\Tests\Unit\Logger\Item;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Item/GetLevelNameCest.php b/tests/unit/Logger/Item/GetLevelNameCest.php
index f6f1c79d3bb..cc6392b4582 100644
--- a/tests/unit/Logger/Item/GetLevelNameCest.php
+++ b/tests/unit/Logger/Item/GetLevelNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Item;
+namespace Phalcon\Tests\Unit\Logger\Item;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Item/GetMessageCest.php b/tests/unit/Logger/Item/GetMessageCest.php
index bcd99aaca13..e0715ceed96 100644
--- a/tests/unit/Logger/Item/GetMessageCest.php
+++ b/tests/unit/Logger/Item/GetMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Item;
+namespace Phalcon\Tests\Unit\Logger\Item;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Item/GetTimeCest.php b/tests/unit/Logger/Item/GetTimeCest.php
index fe2920a617e..e28d8ac54e6 100644
--- a/tests/unit/Logger/Item/GetTimeCest.php
+++ b/tests/unit/Logger/Item/GetTimeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Item;
+namespace Phalcon\Tests\Unit\Logger\Item;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
diff --git a/tests/unit/Logger/Logger/AddAdapterCest.php b/tests/unit/Logger/Logger/AddAdapterCest.php
index 426a81ec557..615d07976b2 100644
--- a/tests/unit/Logger/Logger/AddAdapterCest.php
+++ b/tests/unit/Logger/Logger/AddAdapterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/AlertCest.php b/tests/unit/Logger/Logger/AlertCest.php
index f722e4ee93b..ee4ddbb8626 100644
--- a/tests/unit/Logger/Logger/AlertCest.php
+++ b/tests/unit/Logger/Logger/AlertCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class AlertCest
diff --git a/tests/unit/Logger/Logger/ConstructCest.php b/tests/unit/Logger/Logger/ConstructCest.php
index 0f3481d5a22..a1d34ae2c6f 100644
--- a/tests/unit/Logger/Logger/ConstructCest.php
+++ b/tests/unit/Logger/Logger/ConstructCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use DateTimeImmutable;
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
 use Phalcon\Logger\Exception;
 use Phalcon\Logger\Formatter\Json;
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use Psr\Log\LoggerInterface;
 use UnitTester;
 
diff --git a/tests/unit/Logger/Logger/CriticalCest.php b/tests/unit/Logger/Logger/CriticalCest.php
index 117e63d8142..c3c3160e8e1 100644
--- a/tests/unit/Logger/Logger/CriticalCest.php
+++ b/tests/unit/Logger/Logger/CriticalCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class CriticalCest
diff --git a/tests/unit/Logger/Logger/DebugCest.php b/tests/unit/Logger/Logger/DebugCest.php
index 85f067a8531..c75d02e8414 100644
--- a/tests/unit/Logger/Logger/DebugCest.php
+++ b/tests/unit/Logger/Logger/DebugCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class DebugCest
diff --git a/tests/unit/Logger/Logger/EmergencyCest.php b/tests/unit/Logger/Logger/EmergencyCest.php
index bbf4aa5bc31..ee45ae32371 100644
--- a/tests/unit/Logger/Logger/EmergencyCest.php
+++ b/tests/unit/Logger/Logger/EmergencyCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class EmergencyCest
diff --git a/tests/unit/Logger/Logger/ErrorCest.php b/tests/unit/Logger/Logger/ErrorCest.php
index bf1602ca628..a7a14a6ef59 100644
--- a/tests/unit/Logger/Logger/ErrorCest.php
+++ b/tests/unit/Logger/Logger/ErrorCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class ErrorCest
diff --git a/tests/unit/Logger/Logger/ExcludeAdaptersCest.php b/tests/unit/Logger/Logger/ExcludeAdaptersCest.php
index bc4bb72b4eb..2d98ff0c179 100644
--- a/tests/unit/Logger/Logger/ExcludeAdaptersCest.php
+++ b/tests/unit/Logger/Logger/ExcludeAdaptersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/GetAdapterCest.php b/tests/unit/Logger/Logger/GetAdapterCest.php
index 3d71c3acaa8..579b39fe92e 100644
--- a/tests/unit/Logger/Logger/GetAdapterCest.php
+++ b/tests/unit/Logger/Logger/GetAdapterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/GetAdaptersCest.php b/tests/unit/Logger/Logger/GetAdaptersCest.php
index 28c99827221..a96800a58ef 100644
--- a/tests/unit/Logger/Logger/GetAdaptersCest.php
+++ b/tests/unit/Logger/Logger/GetAdaptersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/GetNameCest.php b/tests/unit/Logger/Logger/GetNameCest.php
index 82919c7cfb1..8828f3b23e9 100644
--- a/tests/unit/Logger/Logger/GetNameCest.php
+++ b/tests/unit/Logger/Logger/GetNameCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use UnitTester;
diff --git a/tests/unit/Logger/Logger/GetSetLogLevelCest.php b/tests/unit/Logger/Logger/GetSetLogLevelCest.php
index b6acff316a8..f6606777fd1 100644
--- a/tests/unit/Logger/Logger/GetSetLogLevelCest.php
+++ b/tests/unit/Logger/Logger/GetSetLogLevelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use UnitTester;
diff --git a/tests/unit/Logger/Logger/InfoCest.php b/tests/unit/Logger/Logger/InfoCest.php
index 4f93bc581ee..a6189e48e85 100644
--- a/tests/unit/Logger/Logger/InfoCest.php
+++ b/tests/unit/Logger/Logger/InfoCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class InfoCest
diff --git a/tests/unit/Logger/Logger/LogCest.php b/tests/unit/Logger/Logger/LogCest.php
index 1c7e1585b0e..23714be1105 100644
--- a/tests/unit/Logger/Logger/LogCest.php
+++ b/tests/unit/Logger/Logger/LogCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/NoticeCest.php b/tests/unit/Logger/Logger/NoticeCest.php
index 3051c940130..65240df9a3f 100644
--- a/tests/unit/Logger/Logger/NoticeCest.php
+++ b/tests/unit/Logger/Logger/NoticeCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class NoticeCest
diff --git a/tests/unit/Logger/Logger/RemoveAdapterCest.php b/tests/unit/Logger/Logger/RemoveAdapterCest.php
index 2f7fb66ad1d..92b51bc5a2b 100644
--- a/tests/unit/Logger/Logger/RemoveAdapterCest.php
+++ b/tests/unit/Logger/Logger/RemoveAdapterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/SetAdaptersCest.php b/tests/unit/Logger/Logger/SetAdaptersCest.php
index 2d60821c51d..81b0a1d6534 100644
--- a/tests/unit/Logger/Logger/SetAdaptersCest.php
+++ b/tests/unit/Logger/Logger/SetAdaptersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
 use Phalcon\Logger;
 use Phalcon\Logger\Adapter\Stream;
diff --git a/tests/unit/Logger/Logger/WarningCest.php b/tests/unit/Logger/Logger/WarningCest.php
index 326e1c961cd..a8f147dfc8e 100644
--- a/tests/unit/Logger/Logger/WarningCest.php
+++ b/tests/unit/Logger/Logger/WarningCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\Logger;
+namespace Phalcon\Tests\Unit\Logger\Logger;
 
-use Phalcon\Test\Fixtures\Traits\LoggerTrait;
+use Phalcon\Tests\Fixtures\Traits\LoggerTrait;
 use UnitTester;
 
 class WarningCest
diff --git a/tests/unit/Logger/LoggerFactory/LoadCest.php b/tests/unit/Logger/LoggerFactory/LoadCest.php
index 8637abe165d..b06890e4f72 100644
--- a/tests/unit/Logger/LoggerFactory/LoadCest.php
+++ b/tests/unit/Logger/LoggerFactory/LoadCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\LoggerFactory;
+namespace Phalcon\Tests\Unit\Logger\LoggerFactory;
 
 use Phalcon\Logger;
 use Phalcon\Logger\AdapterFactory;
 use Phalcon\Logger\LoggerFactory;
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 use UnitTester;
 
 class LoadCest
diff --git a/tests/unit/Logger/LoggerFactory/NewInstanceCest.php b/tests/unit/Logger/LoggerFactory/NewInstanceCest.php
index 72dc9ff3cb3..6cb05e957ac 100644
--- a/tests/unit/Logger/LoggerFactory/NewInstanceCest.php
+++ b/tests/unit/Logger/LoggerFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Logger\LoggerFactory;
+namespace Phalcon\Tests\Unit\Logger\LoggerFactory;
 
 use Phalcon\Logger;
 use Phalcon\Logger\AdapterFactory;
diff --git a/tests/unit/Messages/Message/ConstructCest.php b/tests/unit/Messages/Message/ConstructCest.php
index e6059a70cba..4239f341197 100644
--- a/tests/unit/Messages/Message/ConstructCest.php
+++ b/tests/unit/Messages/Message/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use InvalidArgumentException;
 use Phalcon\Messages\Message;
diff --git a/tests/unit/Messages/Message/GetSetCodeCest.php b/tests/unit/Messages/Message/GetSetCodeCest.php
index 9fc4235b7a3..b80425d039b 100644
--- a/tests/unit/Messages/Message/GetSetCodeCest.php
+++ b/tests/unit/Messages/Message/GetSetCodeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use Phalcon\Messages\Message;
 use UnitTester;
diff --git a/tests/unit/Messages/Message/GetSetFieldCest.php b/tests/unit/Messages/Message/GetSetFieldCest.php
index ffa5acfe9ec..32e9269173b 100644
--- a/tests/unit/Messages/Message/GetSetFieldCest.php
+++ b/tests/unit/Messages/Message/GetSetFieldCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use Phalcon\Messages\Message;
 use UnitTester;
diff --git a/tests/unit/Messages/Message/GetSetMessageCest.php b/tests/unit/Messages/Message/GetSetMessageCest.php
index 7f47aa7d149..d6ac3a21128 100644
--- a/tests/unit/Messages/Message/GetSetMessageCest.php
+++ b/tests/unit/Messages/Message/GetSetMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use Phalcon\Messages\Message;
 use UnitTester;
diff --git a/tests/unit/Messages/Message/GetSetMetaDataCest.php b/tests/unit/Messages/Message/GetSetMetaDataCest.php
index 457a2e6a2c6..3a1503b94fb 100644
--- a/tests/unit/Messages/Message/GetSetMetaDataCest.php
+++ b/tests/unit/Messages/Message/GetSetMetaDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use Phalcon\Messages\Message;
 use UnitTester;
diff --git a/tests/unit/Messages/Message/GetSetTypeCest.php b/tests/unit/Messages/Message/GetSetTypeCest.php
index 79cb691051e..5c33495fe54 100644
--- a/tests/unit/Messages/Message/GetSetTypeCest.php
+++ b/tests/unit/Messages/Message/GetSetTypeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use Phalcon\Messages\Message;
 use UnitTester;
diff --git a/tests/unit/Messages/Message/JsonSerializeCest.php b/tests/unit/Messages/Message/JsonSerializeCest.php
index 6fb467f06cc..9f451a090bc 100644
--- a/tests/unit/Messages/Message/JsonSerializeCest.php
+++ b/tests/unit/Messages/Message/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use JsonSerializable;
 use Phalcon\Messages\Message;
diff --git a/tests/unit/Messages/Message/ToStringCest.php b/tests/unit/Messages/Message/ToStringCest.php
index a23937b9d35..533dbbf34d3 100644
--- a/tests/unit/Messages/Message/ToStringCest.php
+++ b/tests/unit/Messages/Message/ToStringCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Message;
+namespace Phalcon\Tests\Unit\Messages\Message;
 
 use Phalcon\Messages\Message;
 use UnitTester;
diff --git a/tests/unit/Messages/Messages/AppendMessageCest.php b/tests/unit/Messages/Messages/AppendMessageCest.php
index e9a1f2ddf81..07ed3c9f009 100644
--- a/tests/unit/Messages/Messages/AppendMessageCest.php
+++ b/tests/unit/Messages/Messages/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/AppendMessagesCest.php b/tests/unit/Messages/Messages/AppendMessagesCest.php
index 95aec53f239..6551ec511e6 100644
--- a/tests/unit/Messages/Messages/AppendMessagesCest.php
+++ b/tests/unit/Messages/Messages/AppendMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/ConstructCest.php b/tests/unit/Messages/Messages/ConstructCest.php
index 37397988097..c00b6d976b8 100644
--- a/tests/unit/Messages/Messages/ConstructCest.php
+++ b/tests/unit/Messages/Messages/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/CountCest.php b/tests/unit/Messages/Messages/CountCest.php
index 01bbe5d3d60..4a338826cfd 100644
--- a/tests/unit/Messages/Messages/CountCest.php
+++ b/tests/unit/Messages/Messages/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/CurrentCest.php b/tests/unit/Messages/Messages/CurrentCest.php
index ad8ec6e2c25..947598f5137 100644
--- a/tests/unit/Messages/Messages/CurrentCest.php
+++ b/tests/unit/Messages/Messages/CurrentCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/FilterCest.php b/tests/unit/Messages/Messages/FilterCest.php
index 17d2bde33e1..e88ee7d2063 100644
--- a/tests/unit/Messages/Messages/FilterCest.php
+++ b/tests/unit/Messages/Messages/FilterCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/JsonSerializeCest.php b/tests/unit/Messages/Messages/JsonSerializeCest.php
index 7c2fed673d0..1a3d76bf4d5 100644
--- a/tests/unit/Messages/Messages/JsonSerializeCest.php
+++ b/tests/unit/Messages/Messages/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use JsonSerializable;
 use Phalcon\Messages\Message;
diff --git a/tests/unit/Messages/Messages/KeyCest.php b/tests/unit/Messages/Messages/KeyCest.php
index 0623a28fa78..270c8a81876 100644
--- a/tests/unit/Messages/Messages/KeyCest.php
+++ b/tests/unit/Messages/Messages/KeyCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/NextCest.php b/tests/unit/Messages/Messages/NextCest.php
index 4f69ebc2964..5fe794b7b5e 100644
--- a/tests/unit/Messages/Messages/NextCest.php
+++ b/tests/unit/Messages/Messages/NextCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/OffsetExistsCest.php b/tests/unit/Messages/Messages/OffsetExistsCest.php
index 440fe1f85aa..d8b516cdfba 100644
--- a/tests/unit/Messages/Messages/OffsetExistsCest.php
+++ b/tests/unit/Messages/Messages/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/OffsetGetSetCest.php b/tests/unit/Messages/Messages/OffsetGetSetCest.php
index 638b44dd7ad..f83e4d5b312 100644
--- a/tests/unit/Messages/Messages/OffsetGetSetCest.php
+++ b/tests/unit/Messages/Messages/OffsetGetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/OffsetUnsetCest.php b/tests/unit/Messages/Messages/OffsetUnsetCest.php
index 8b31d09eac0..e86fe6d601c 100644
--- a/tests/unit/Messages/Messages/OffsetUnsetCest.php
+++ b/tests/unit/Messages/Messages/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/RewindCest.php b/tests/unit/Messages/Messages/RewindCest.php
index 6f77b16fe64..c6d50984f74 100644
--- a/tests/unit/Messages/Messages/RewindCest.php
+++ b/tests/unit/Messages/Messages/RewindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Messages/Messages/ValidCest.php b/tests/unit/Messages/Messages/ValidCest.php
index 2df521200ec..f4cf61a625c 100644
--- a/tests/unit/Messages/Messages/ValidCest.php
+++ b/tests/unit/Messages/Messages/ValidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Messages\Messages;
+namespace Phalcon\Tests\Unit\Messages\Messages;
 
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
diff --git a/tests/unit/Registry/ClearCest.php b/tests/unit/Registry/ClearCest.php
index 8fb574046c1..f1fa8764e41 100644
--- a/tests/unit/Registry/ClearCest.php
+++ b/tests/unit/Registry/ClearCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/ConstructCest.php b/tests/unit/Registry/ConstructCest.php
index 6594a5e88da..a12e38288e6 100644
--- a/tests/unit/Registry/ConstructCest.php
+++ b/tests/unit/Registry/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/CountCest.php b/tests/unit/Registry/CountCest.php
index 1ebaaad0fa7..72af112fc76 100644
--- a/tests/unit/Registry/CountCest.php
+++ b/tests/unit/Registry/CountCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/GetCest.php b/tests/unit/Registry/GetCest.php
index dc41f1b9229..613a9a60609 100644
--- a/tests/unit/Registry/GetCest.php
+++ b/tests/unit/Registry/GetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Codeception\Example;
 use Phalcon\Registry;
diff --git a/tests/unit/Registry/GetIteratorCest.php b/tests/unit/Registry/GetIteratorCest.php
index e9062c33809..8684d33a425 100644
--- a/tests/unit/Registry/GetIteratorCest.php
+++ b/tests/unit/Registry/GetIteratorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/HasCest.php b/tests/unit/Registry/HasCest.php
index 19716c4a242..c9a5313c64a 100644
--- a/tests/unit/Registry/HasCest.php
+++ b/tests/unit/Registry/HasCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/InitCest.php b/tests/unit/Registry/InitCest.php
index 1c6c1b8a7a7..990864730ef 100644
--- a/tests/unit/Registry/InitCest.php
+++ b/tests/unit/Registry/InitCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/JsonSerializeCest.php b/tests/unit/Registry/JsonSerializeCest.php
index 15abcf36d63..6e1d2e2998f 100644
--- a/tests/unit/Registry/JsonSerializeCest.php
+++ b/tests/unit/Registry/JsonSerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/OffsetExistsCest.php b/tests/unit/Registry/OffsetExistsCest.php
index 2a7da19d100..650f2b0fbec 100644
--- a/tests/unit/Registry/OffsetExistsCest.php
+++ b/tests/unit/Registry/OffsetExistsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/OffsetGetCest.php b/tests/unit/Registry/OffsetGetCest.php
index d98f626bc72..4049fc2c359 100644
--- a/tests/unit/Registry/OffsetGetCest.php
+++ b/tests/unit/Registry/OffsetGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/OffsetSetCest.php b/tests/unit/Registry/OffsetSetCest.php
index cec8093b353..2f97f1d8dc7 100644
--- a/tests/unit/Registry/OffsetSetCest.php
+++ b/tests/unit/Registry/OffsetSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/OffsetUnsetCest.php b/tests/unit/Registry/OffsetUnsetCest.php
index 8a6479ccdae..5bee581b2ab 100644
--- a/tests/unit/Registry/OffsetUnsetCest.php
+++ b/tests/unit/Registry/OffsetUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/RemoveCest.php b/tests/unit/Registry/RemoveCest.php
index c9143e46a77..6905e787108 100644
--- a/tests/unit/Registry/RemoveCest.php
+++ b/tests/unit/Registry/RemoveCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/SerializeCest.php b/tests/unit/Registry/SerializeCest.php
index 3b27c2eb980..2c47e0fd464 100644
--- a/tests/unit/Registry/SerializeCest.php
+++ b/tests/unit/Registry/SerializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/SetCest.php b/tests/unit/Registry/SetCest.php
index acf78ead69d..c7e5e4a0c6e 100644
--- a/tests/unit/Registry/SetCest.php
+++ b/tests/unit/Registry/SetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/ToArrayCest.php b/tests/unit/Registry/ToArrayCest.php
index 22e85ab2ede..a64a11528b4 100644
--- a/tests/unit/Registry/ToArrayCest.php
+++ b/tests/unit/Registry/ToArrayCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/ToJsonCest.php b/tests/unit/Registry/ToJsonCest.php
index 968e4195c07..727e87f156b 100644
--- a/tests/unit/Registry/ToJsonCest.php
+++ b/tests/unit/Registry/ToJsonCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/UnderscoreGetCest.php b/tests/unit/Registry/UnderscoreGetCest.php
index 9a81fd49462..1e7f9916665 100644
--- a/tests/unit/Registry/UnderscoreGetCest.php
+++ b/tests/unit/Registry/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/UnderscoreIsSetCest.php b/tests/unit/Registry/UnderscoreIsSetCest.php
index 25b7099e2ac..fd48bf283de 100644
--- a/tests/unit/Registry/UnderscoreIsSetCest.php
+++ b/tests/unit/Registry/UnderscoreIsSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/UnderscoreSetCest.php b/tests/unit/Registry/UnderscoreSetCest.php
index 1e0747a0af7..6f526430861 100644
--- a/tests/unit/Registry/UnderscoreSetCest.php
+++ b/tests/unit/Registry/UnderscoreSetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/UnderscoreUnsetCest.php b/tests/unit/Registry/UnderscoreUnsetCest.php
index 980607e6a58..cdf96864d54 100644
--- a/tests/unit/Registry/UnderscoreUnsetCest.php
+++ b/tests/unit/Registry/UnderscoreUnsetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Registry/UnserializeCest.php b/tests/unit/Registry/UnserializeCest.php
index a81637bc803..bc9941dcc27 100644
--- a/tests/unit/Registry/UnserializeCest.php
+++ b/tests/unit/Registry/UnserializeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Registry;
+namespace Phalcon\Tests\Unit\Registry;
 
 use Phalcon\Registry;
 use UnitTester;
diff --git a/tests/unit/Security/CheckHashCest.php b/tests/unit/Security/CheckHashCest.php
index 10fe1427fbb..09526dc7a3a 100644
--- a/tests/unit/Security/CheckHashCest.php
+++ b/tests/unit/Security/CheckHashCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/CheckTokenCest.php b/tests/unit/Security/CheckTokenCest.php
index 273960c346f..bd94d5dffa3 100644
--- a/tests/unit/Security/CheckTokenCest.php
+++ b/tests/unit/Security/CheckTokenCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function session_destroy;
diff --git a/tests/unit/Security/ComputeHmacCest.php b/tests/unit/Security/ComputeHmacCest.php
index f3b58033aa6..330026feec2 100644
--- a/tests/unit/Security/ComputeHmacCest.php
+++ b/tests/unit/Security/ComputeHmacCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Codeception\Example;
 use Phalcon\Security;
diff --git a/tests/unit/Security/ConstructCest.php b/tests/unit/Security/ConstructCest.php
index 131da265fa7..3f8c95b4dda 100644
--- a/tests/unit/Security/ConstructCest.php
+++ b/tests/unit/Security/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/GetRandomCest.php b/tests/unit/Security/GetRandomCest.php
index d9544565dca..4ff5db99b70 100644
--- a/tests/unit/Security/GetRandomCest.php
+++ b/tests/unit/Security/GetRandomCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use Phalcon\Security\Random;
diff --git a/tests/unit/Security/GetRequestTokenCest.php b/tests/unit/Security/GetRequestTokenCest.php
index a96d1225026..02596380f70 100644
--- a/tests/unit/Security/GetRequestTokenCest.php
+++ b/tests/unit/Security/GetRequestTokenCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function session_destroy;
diff --git a/tests/unit/Security/GetSaltBytesCest.php b/tests/unit/Security/GetSaltBytesCest.php
index a16b39d34ca..4724d5a87a2 100644
--- a/tests/unit/Security/GetSaltBytesCest.php
+++ b/tests/unit/Security/GetSaltBytesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/GetSetDefaultHashCest.php b/tests/unit/Security/GetSetDefaultHashCest.php
index a51750b19da..cff738aaeac 100644
--- a/tests/unit/Security/GetSetDefaultHashCest.php
+++ b/tests/unit/Security/GetSetDefaultHashCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/GetSetRandomBytesCest.php b/tests/unit/Security/GetSetRandomBytesCest.php
index f7b550a3734..929c9892a8a 100644
--- a/tests/unit/Security/GetSetRandomBytesCest.php
+++ b/tests/unit/Security/GetSetRandomBytesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/GetSetWorkFactorCest.php b/tests/unit/Security/GetSetWorkFactorCest.php
index f5fa827a792..7c18e5ce57c 100644
--- a/tests/unit/Security/GetSetWorkFactorCest.php
+++ b/tests/unit/Security/GetSetWorkFactorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/GetTokenAndKeyCest.php b/tests/unit/Security/GetTokenAndKeyCest.php
index 84aecb45868..d19b64e92d6 100644
--- a/tests/unit/Security/GetTokenAndKeyCest.php
+++ b/tests/unit/Security/GetTokenAndKeyCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 use function session_destroy;
diff --git a/tests/unit/Security/IsLegacyHashCest.php b/tests/unit/Security/IsLegacyHashCest.php
index 6d4b2a0e6b6..deea5082a96 100644
--- a/tests/unit/Security/IsLegacyHashCest.php
+++ b/tests/unit/Security/IsLegacyHashCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security;
+namespace Phalcon\Tests\Unit\Security;
 
 use Phalcon\Security;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Builder/AddClaimCest.php b/tests/unit/Security/JWT/Builder/AddClaimCest.php
index a9026a1a254..546ed4bf024 100644
--- a/tests/unit/Security/JWT/Builder/AddClaimCest.php
+++ b/tests/unit/Security/JWT/Builder/AddClaimCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/ConstructCest.php b/tests/unit/Security/JWT/Builder/ConstructCest.php
index 2e211f7f08f..268494fa596 100644
--- a/tests/unit/Security/JWT/Builder/ConstructCest.php
+++ b/tests/unit/Security/JWT/Builder/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetClaimsCest.php b/tests/unit/Security/JWT/Builder/GetClaimsCest.php
index 9f8a37bbcce..cc0c5608ef8 100644
--- a/tests/unit/Security/JWT/Builder/GetClaimsCest.php
+++ b/tests/unit/Security/JWT/Builder/GetClaimsCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetHeadersCest.php b/tests/unit/Security/JWT/Builder/GetHeadersCest.php
index 40774d06322..861ec3c4166 100644
--- a/tests/unit/Security/JWT/Builder/GetHeadersCest.php
+++ b/tests/unit/Security/JWT/Builder/GetHeadersCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetSetAudienceCest.php b/tests/unit/Security/JWT/Builder/GetSetAudienceCest.php
index 9bd1d56eb2b..3b36f361e62 100644
--- a/tests/unit/Security/JWT/Builder/GetSetAudienceCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetAudienceCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
diff --git a/tests/unit/Security/JWT/Builder/GetSetContentTypeCest.php b/tests/unit/Security/JWT/Builder/GetSetContentTypeCest.php
index 65d5290df24..9c60d2f6a75 100644
--- a/tests/unit/Security/JWT/Builder/GetSetContentTypeCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetContentTypeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetSetExpirationTimeCest.php b/tests/unit/Security/JWT/Builder/GetSetExpirationTimeCest.php
index 2b4c70e1a18..5d6f7739cfc 100644
--- a/tests/unit/Security/JWT/Builder/GetSetExpirationTimeCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetExpirationTimeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
diff --git a/tests/unit/Security/JWT/Builder/GetSetIdCest.php b/tests/unit/Security/JWT/Builder/GetSetIdCest.php
index 6f137418132..1babba6c01b 100644
--- a/tests/unit/Security/JWT/Builder/GetSetIdCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetIdCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetSetIssuedAtCest.php b/tests/unit/Security/JWT/Builder/GetSetIssuedAtCest.php
index aa35ca378a1..0710288d4fb 100644
--- a/tests/unit/Security/JWT/Builder/GetSetIssuedAtCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetIssuedAtCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetSetIssuerCest.php b/tests/unit/Security/JWT/Builder/GetSetIssuerCest.php
index e3654f06e86..ef81ce83f3f 100644
--- a/tests/unit/Security/JWT/Builder/GetSetIssuerCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetIssuerCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetSetNotBeforeCest.php b/tests/unit/Security/JWT/Builder/GetSetNotBeforeCest.php
index a743091f33d..7e269b28b66 100644
--- a/tests/unit/Security/JWT/Builder/GetSetNotBeforeCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetNotBeforeCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
diff --git a/tests/unit/Security/JWT/Builder/GetSetPassphraseCest.php b/tests/unit/Security/JWT/Builder/GetSetPassphraseCest.php
index deea950931d..65e91ebe50a 100644
--- a/tests/unit/Security/JWT/Builder/GetSetPassphraseCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetPassphraseCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\UnsupportedAlgorithmException;
diff --git a/tests/unit/Security/JWT/Builder/GetSetSubjectCest.php b/tests/unit/Security/JWT/Builder/GetSetSubjectCest.php
index 9d9edf37f3f..92b0c55e00e 100644
--- a/tests/unit/Security/JWT/Builder/GetSetSubjectCest.php
+++ b/tests/unit/Security/JWT/Builder/GetSetSubjectCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Builder/GetTokenCest.php b/tests/unit/Security/JWT/Builder/GetTokenCest.php
index 847272b18dd..42bee5d918f 100644
--- a/tests/unit/Security/JWT/Builder/GetTokenCest.php
+++ b/tests/unit/Security/JWT/Builder/GetTokenCest.php
@@ -9,13 +9,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Signer\Hmac;
 use Phalcon\Security\JWT\Token\Token;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class GetTokenCest
diff --git a/tests/unit/Security/JWT/Builder/InitCest.php b/tests/unit/Security/JWT/Builder/InitCest.php
index 9e883570f4f..14aae8af120 100644
--- a/tests/unit/Security/JWT/Builder/InitCest.php
+++ b/tests/unit/Security/JWT/Builder/InitCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Builder;
+namespace Phalcon\Tests\Unit\Security\JWT\Builder;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Signer/Hmac/ConstructCest.php b/tests/unit/Security/JWT/Signer/Hmac/ConstructCest.php
index afda6093319..a718a169b71 100644
--- a/tests/unit/Security/JWT/Signer/Hmac/ConstructCest.php
+++ b/tests/unit/Security/JWT/Signer/Hmac/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\Hmac;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\Hmac;
 
 use Phalcon\Security\JWT\Exceptions\UnsupportedAlgorithmException;
 use Phalcon\Security\JWT\Signer\Hmac;
diff --git a/tests/unit/Security/JWT/Signer/Hmac/GetAlgHeaderCest.php b/tests/unit/Security/JWT/Signer/Hmac/GetAlgHeaderCest.php
index c41e4c2aa5c..5ec9b717937 100644
--- a/tests/unit/Security/JWT/Signer/Hmac/GetAlgHeaderCest.php
+++ b/tests/unit/Security/JWT/Signer/Hmac/GetAlgHeaderCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\Hmac;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\Hmac;
 
 use Phalcon\Security\JWT\Signer\Hmac;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/Hmac/GetAlgorithmCest.php b/tests/unit/Security/JWT/Signer/Hmac/GetAlgorithmCest.php
index 4b063f744b8..78d98f8924b 100644
--- a/tests/unit/Security/JWT/Signer/Hmac/GetAlgorithmCest.php
+++ b/tests/unit/Security/JWT/Signer/Hmac/GetAlgorithmCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\Hmac;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\Hmac;
 
 use Phalcon\Security\JWT\Signer\Hmac;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/Hmac/SignCest.php b/tests/unit/Security/JWT/Signer/Hmac/SignCest.php
index 6747208f2ba..451f0679527 100644
--- a/tests/unit/Security/JWT/Signer/Hmac/SignCest.php
+++ b/tests/unit/Security/JWT/Signer/Hmac/SignCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\Hmac;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\Hmac;
 
 use Phalcon\Security\JWT\Signer\Hmac;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/Hmac/VerifyCest.php b/tests/unit/Security/JWT/Signer/Hmac/VerifyCest.php
index d5493c0dd15..dc237c2e94e 100644
--- a/tests/unit/Security/JWT/Signer/Hmac/VerifyCest.php
+++ b/tests/unit/Security/JWT/Signer/Hmac/VerifyCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\Hmac;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\Hmac;
 
 use Phalcon\Security\JWT\Signer\Hmac;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/None/ConstructCest.php b/tests/unit/Security/JWT/Signer/None/ConstructCest.php
index fe909bfc2e7..b5050263454 100644
--- a/tests/unit/Security/JWT/Signer/None/ConstructCest.php
+++ b/tests/unit/Security/JWT/Signer/None/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\None;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\None;
 
 use Phalcon\Security\JWT\Signer\None;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/None/GetAlgHeaderCest.php b/tests/unit/Security/JWT/Signer/None/GetAlgHeaderCest.php
index f4d8a7c8b89..fc62349e351 100644
--- a/tests/unit/Security/JWT/Signer/None/GetAlgHeaderCest.php
+++ b/tests/unit/Security/JWT/Signer/None/GetAlgHeaderCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\None;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\None;
 
 use Phalcon\Security\JWT\Signer\None;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/None/GetAlgorithmCest.php b/tests/unit/Security/JWT/Signer/None/GetAlgorithmCest.php
index 6b91e5f09a8..4cb5cf89274 100644
--- a/tests/unit/Security/JWT/Signer/None/GetAlgorithmCest.php
+++ b/tests/unit/Security/JWT/Signer/None/GetAlgorithmCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\None;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\None;
 
 use Phalcon\Security\JWT\Signer\None;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/None/SignCest.php b/tests/unit/Security/JWT/Signer/None/SignCest.php
index 9f62b19bcbc..90bc5e4d4ac 100644
--- a/tests/unit/Security/JWT/Signer/None/SignCest.php
+++ b/tests/unit/Security/JWT/Signer/None/SignCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\None;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\None;
 
 use Phalcon\Security\JWT\Signer\None;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Signer/None/VerifyCest.php b/tests/unit/Security/JWT/Signer/None/VerifyCest.php
index 08265420cf5..c952e28bd39 100644
--- a/tests/unit/Security/JWT/Signer/None/VerifyCest.php
+++ b/tests/unit/Security/JWT/Signer/None/VerifyCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Signer\None;
+namespace Phalcon\Tests\Unit\Security\JWT\Signer\None;
 
 use Phalcon\Security\JWT\Signer\None;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Item/ConstructCest.php b/tests/unit/Security/JWT/Token/Item/ConstructCest.php
index 11ca1472591..6a776793ce4 100644
--- a/tests/unit/Security/JWT/Token/Item/ConstructCest.php
+++ b/tests/unit/Security/JWT/Token/Item/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Item;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Item;
 
 use Phalcon\Security\JWT\Token\Item;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Item/GetCest.php b/tests/unit/Security/JWT/Token/Item/GetCest.php
index 110ea85121e..e39ad0d9bd0 100644
--- a/tests/unit/Security/JWT/Token/Item/GetCest.php
+++ b/tests/unit/Security/JWT/Token/Item/GetCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Item;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Item;
 
 use Phalcon\Security\JWT\Token\Item;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Item/HasCest.php b/tests/unit/Security/JWT/Token/Item/HasCest.php
index ac740f29fb7..79592ca746d 100644
--- a/tests/unit/Security/JWT/Token/Item/HasCest.php
+++ b/tests/unit/Security/JWT/Token/Item/HasCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Item;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Item;
 
 use Phalcon\Security\JWT\Token\Item;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Item/UnderscoreCallCest.php b/tests/unit/Security/JWT/Token/Item/UnderscoreCallCest.php
index 0c8a9c9b02e..8fa5fb3959b 100644
--- a/tests/unit/Security/JWT/Token/Item/UnderscoreCallCest.php
+++ b/tests/unit/Security/JWT/Token/Item/UnderscoreCallCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Item;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Item;
 
 use Phalcon\Security\JWT\Token\Item;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Parser/ParseCest.php b/tests/unit/Security/JWT/Token/Parser/ParseCest.php
index 8338f72eb9e..bb4f0a30e00 100644
--- a/tests/unit/Security/JWT/Token/Parser/ParseCest.php
+++ b/tests/unit/Security/JWT/Token/Parser/ParseCest.php
@@ -9,14 +9,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Parser;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Parser;
 
 use InvalidArgumentException;
 use Phalcon\Security\JWT\Signer\None;
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Parser;
 use Phalcon\Security\JWT\Token\Signature;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ParseCest
diff --git a/tests/unit/Security/JWT/Token/Signature/ConstructCest.php b/tests/unit/Security/JWT/Token/Signature/ConstructCest.php
index 4eb6ad07302..3342882a1ca 100644
--- a/tests/unit/Security/JWT/Token/Signature/ConstructCest.php
+++ b/tests/unit/Security/JWT/Token/Signature/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Signature;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Signature;
 
 use Phalcon\Security\JWT\Token\Signature;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Signature/UnderscoreCallCest.php b/tests/unit/Security/JWT/Token/Signature/UnderscoreCallCest.php
index 418c64ce23f..bc4b155033e 100644
--- a/tests/unit/Security/JWT/Token/Signature/UnderscoreCallCest.php
+++ b/tests/unit/Security/JWT/Token/Signature/UnderscoreCallCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Signature;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Signature;
 
 use Phalcon\Security\JWT\Token\Signature;
 use UnitTester;
diff --git a/tests/unit/Security/JWT/Token/Token/ConstructCest.php b/tests/unit/Security/JWT/Token/Token/ConstructCest.php
index 338a8e6be89..02c7e0f84e9 100644
--- a/tests/unit/Security/JWT/Token/Token/ConstructCest.php
+++ b/tests/unit/Security/JWT/Token/Token/ConstructCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Token;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Token;
 
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Signature;
diff --git a/tests/unit/Security/JWT/Token/Token/GetClaimsCest.php b/tests/unit/Security/JWT/Token/Token/GetClaimsCest.php
index 5d126faccda..73715872720 100644
--- a/tests/unit/Security/JWT/Token/Token/GetClaimsCest.php
+++ b/tests/unit/Security/JWT/Token/Token/GetClaimsCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Token;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Token;
 
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Signature;
diff --git a/tests/unit/Security/JWT/Token/Token/GetHeadersCest.php b/tests/unit/Security/JWT/Token/Token/GetHeadersCest.php
index f2691584bfe..d1f85a306a8 100644
--- a/tests/unit/Security/JWT/Token/Token/GetHeadersCest.php
+++ b/tests/unit/Security/JWT/Token/Token/GetHeadersCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Token;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Token;
 
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Signature;
diff --git a/tests/unit/Security/JWT/Token/Token/GetPayloadCest.php b/tests/unit/Security/JWT/Token/Token/GetPayloadCest.php
index 9174dc8c5ea..1e5e1bbc93d 100644
--- a/tests/unit/Security/JWT/Token/Token/GetPayloadCest.php
+++ b/tests/unit/Security/JWT/Token/Token/GetPayloadCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Token;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Token;
 
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Signature;
diff --git a/tests/unit/Security/JWT/Token/Token/GetSignatureCest.php b/tests/unit/Security/JWT/Token/Token/GetSignatureCest.php
index 1dfad177159..d77a00a952b 100644
--- a/tests/unit/Security/JWT/Token/Token/GetSignatureCest.php
+++ b/tests/unit/Security/JWT/Token/Token/GetSignatureCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Token;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Token;
 
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Signature;
diff --git a/tests/unit/Security/JWT/Token/Token/GetTokenCest.php b/tests/unit/Security/JWT/Token/Token/GetTokenCest.php
index 6fa28aa0249..68e63d58209 100644
--- a/tests/unit/Security/JWT/Token/Token/GetTokenCest.php
+++ b/tests/unit/Security/JWT/Token/Token/GetTokenCest.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Token\Token;
+namespace Phalcon\Tests\Unit\Security\JWT\Token\Token;
 
 use Phalcon\Security\JWT\Token\Item;
 use Phalcon\Security\JWT\Token\Signature;
diff --git a/tests/unit/Security/JWT/Validator/ConstructCest.php b/tests/unit/Security/JWT/Validator/ConstructCest.php
index 6b196fce9d5..a12fae65d86 100644
--- a/tests/unit/Security/JWT/Validator/ConstructCest.php
+++ b/tests/unit/Security/JWT/Validator/ConstructCest.php
@@ -9,10 +9,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Security/JWT/Validator/SetTokenCest.php b/tests/unit/Security/JWT/Validator/SetTokenCest.php
index 146cf5a9d2c..0b9a124c524 100644
--- a/tests/unit/Security/JWT/Validator/SetTokenCest.php
+++ b/tests/unit/Security/JWT/Validator/SetTokenCest.php
@@ -9,12 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Signer\Hmac;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class SetTokenCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateAudienceCest.php b/tests/unit/Security/JWT/Validator/ValidateAudienceCest.php
index 2be67f13cb0..0304e624ec4 100644
--- a/tests/unit/Security/JWT/Validator/ValidateAudienceCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateAudienceCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateAudienceCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateExpirationCest.php b/tests/unit/Security/JWT/Validator/ValidateExpirationCest.php
index ece2efd51ae..b52e6483a59 100644
--- a/tests/unit/Security/JWT/Validator/ValidateExpirationCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateExpirationCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateExpirationCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateIdCest.php b/tests/unit/Security/JWT/Validator/ValidateIdCest.php
index 6608ab61c5a..f8dcdf93eb4 100644
--- a/tests/unit/Security/JWT/Validator/ValidateIdCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateIdCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateIdCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateIssuedAtCest.php b/tests/unit/Security/JWT/Validator/ValidateIssuedAtCest.php
index 634f88f91d2..2ccdd111689 100644
--- a/tests/unit/Security/JWT/Validator/ValidateIssuedAtCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateIssuedAtCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateIssuedAtCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateIssuerCest.php b/tests/unit/Security/JWT/Validator/ValidateIssuerCest.php
index e80d56ab4e2..c726e807cc5 100644
--- a/tests/unit/Security/JWT/Validator/ValidateIssuerCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateIssuerCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateIssuerCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateNotBeforeCest.php b/tests/unit/Security/JWT/Validator/ValidateNotBeforeCest.php
index c9c4167470a..9d3762a7fde 100644
--- a/tests/unit/Security/JWT/Validator/ValidateNotBeforeCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateNotBeforeCest.php
@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateNotBeforeCest
diff --git a/tests/unit/Security/JWT/Validator/ValidateSignatureCest.php b/tests/unit/Security/JWT/Validator/ValidateSignatureCest.php
index 1d68eea37ff..ef53137c85a 100644
--- a/tests/unit/Security/JWT/Validator/ValidateSignatureCest.php
+++ b/tests/unit/Security/JWT/Validator/ValidateSignatureCest.php
@@ -9,13 +9,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\JWT\Validator;
+namespace Phalcon\Tests\Unit\Security\JWT\Validator;
 
 use Phalcon\Security\JWT\Builder;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Signer\Hmac;
 use Phalcon\Security\JWT\Validator;
-use Phalcon\Test\Fixtures\Traits\JWTTrait;
+use Phalcon\Tests\Fixtures\Traits\JWTTrait;
 use UnitTester;
 
 class ValidateSignatureCest
diff --git a/tests/unit/Security/Random/Base58Cest.php b/tests/unit/Security/Random/Base58Cest.php
index 8ca409493a2..931724d283c 100644
--- a/tests/unit/Security/Random/Base58Cest.php
+++ b/tests/unit/Security/Random/Base58Cest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Phalcon\Security\Random;
 use UnitTester;
diff --git a/tests/unit/Security/Random/Base62Cest.php b/tests/unit/Security/Random/Base62Cest.php
index 9652aa06034..cbb07a36dd7 100644
--- a/tests/unit/Security/Random/Base62Cest.php
+++ b/tests/unit/Security/Random/Base62Cest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Phalcon\Security\Random;
 use UnitTester;
diff --git a/tests/unit/Security/Random/Base64Cest.php b/tests/unit/Security/Random/Base64Cest.php
index 5033365f95a..f4da45f655f 100644
--- a/tests/unit/Security/Random/Base64Cest.php
+++ b/tests/unit/Security/Random/Base64Cest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Codeception\Example;
 use Phalcon\Security\Random;
diff --git a/tests/unit/Security/Random/Base64SafeCest.php b/tests/unit/Security/Random/Base64SafeCest.php
index 531f5dcac02..94617272233 100644
--- a/tests/unit/Security/Random/Base64SafeCest.php
+++ b/tests/unit/Security/Random/Base64SafeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Codeception\Example;
 use Phalcon\Security\Random;
diff --git a/tests/unit/Security/Random/BytesCest.php b/tests/unit/Security/Random/BytesCest.php
index 598a2aefbb5..e585f902446 100644
--- a/tests/unit/Security/Random/BytesCest.php
+++ b/tests/unit/Security/Random/BytesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Phalcon\Security\Random;
 use UnitTester;
diff --git a/tests/unit/Security/Random/HexCest.php b/tests/unit/Security/Random/HexCest.php
index faeba93ccc9..d3a5e6e3c3f 100644
--- a/tests/unit/Security/Random/HexCest.php
+++ b/tests/unit/Security/Random/HexCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Phalcon\Security\Random;
 use UnitTester;
diff --git a/tests/unit/Security/Random/NumberCest.php b/tests/unit/Security/Random/NumberCest.php
index 7a8dfcb1dfc..c039d10368f 100644
--- a/tests/unit/Security/Random/NumberCest.php
+++ b/tests/unit/Security/Random/NumberCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Exception;
 use Phalcon\Security\Random;
diff --git a/tests/unit/Security/Random/UuidCest.php b/tests/unit/Security/Random/UuidCest.php
index 41137356566..3ab7ab6189f 100644
--- a/tests/unit/Security/Random/UuidCest.php
+++ b/tests/unit/Security/Random/UuidCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Security\Random;
+namespace Phalcon\Tests\Unit\Security\Random;
 
 use Phalcon\Security\Random;
 use UnitTester;
diff --git a/tests/unit/Session/ManagerCest.php b/tests/unit/Session/ManagerCest.php
index b94c75319c0..85cee2a1b2f 100644
--- a/tests/unit/Session/ManagerCest.php
+++ b/tests/unit/Session/ManagerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Session;
+namespace Phalcon\Tests\Unit\Session;
 
 use Codeception\Example;
 use Phalcon\Session\Adapter\Noop;
diff --git a/tests/unit/Support/Debug/DebugVarCest.php b/tests/unit/Support/Debug/DebugVarCest.php
index 8630e61d600..422223b3ac0 100644
--- a/tests/unit/Support/Debug/DebugVarCest.php
+++ b/tests/unit/Support/Debug/DebugVarCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/Dump/AllCest.php b/tests/unit/Support/Debug/Dump/AllCest.php
index 1a479d7c3a9..00c9d0ea1d2 100644
--- a/tests/unit/Support/Debug/Dump/AllCest.php
+++ b/tests/unit/Support/Debug/Dump/AllCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use stdClass;
diff --git a/tests/unit/Support/Debug/Dump/ConstructCest.php b/tests/unit/Support/Debug/Dump/ConstructCest.php
index b14e9a5ba48..cb4764338b1 100644
--- a/tests/unit/Support/Debug/Dump/ConstructCest.php
+++ b/tests/unit/Support/Debug/Dump/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
-use Phalcon\Test\Fixtures\Dump\ClassProperties;
+use Phalcon\Tests\Fixtures\Dump\ClassProperties;
 use ReflectionException;
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/Dump/GetSetDetailedCest.php b/tests/unit/Support/Debug/Dump/GetSetDetailedCest.php
index 602eb87c83d..9b828f274de 100644
--- a/tests/unit/Support/Debug/Dump/GetSetDetailedCest.php
+++ b/tests/unit/Support/Debug/Dump/GetSetDetailedCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use UnitTester;
diff --git a/tests/unit/Support/Debug/Dump/OneCest.php b/tests/unit/Support/Debug/Dump/OneCest.php
index 920b3a0c9bf..0d97ad85ab4 100644
--- a/tests/unit/Support/Debug/Dump/OneCest.php
+++ b/tests/unit/Support/Debug/Dump/OneCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use UnitTester;
diff --git a/tests/unit/Support/Debug/Dump/SetStylesCest.php b/tests/unit/Support/Debug/Dump/SetStylesCest.php
index 9cdbcbea3b6..0610c9924ed 100644
--- a/tests/unit/Support/Debug/Dump/SetStylesCest.php
+++ b/tests/unit/Support/Debug/Dump/SetStylesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use ReflectionException;
diff --git a/tests/unit/Support/Debug/Dump/ToJsonCest.php b/tests/unit/Support/Debug/Dump/ToJsonCest.php
index 8a2a47641b6..1d20a2c9034 100644
--- a/tests/unit/Support/Debug/Dump/ToJsonCest.php
+++ b/tests/unit/Support/Debug/Dump/ToJsonCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use UnitTester;
diff --git a/tests/unit/Support/Debug/Dump/VariableCest.php b/tests/unit/Support/Debug/Dump/VariableCest.php
index 6bb1a4fc771..e449f8369fa 100644
--- a/tests/unit/Support/Debug/Dump/VariableCest.php
+++ b/tests/unit/Support/Debug/Dump/VariableCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use UnitTester;
diff --git a/tests/unit/Support/Debug/Dump/VariablesCest.php b/tests/unit/Support/Debug/Dump/VariablesCest.php
index f94b83b18b4..148a9a508df 100644
--- a/tests/unit/Support/Debug/Dump/VariablesCest.php
+++ b/tests/unit/Support/Debug/Dump/VariablesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug\Dump;
+namespace Phalcon\Tests\Unit\Support\Debug\Dump;
 
 use Phalcon\Support\Debug\Dump;
 use stdClass;
diff --git a/tests/unit/Support/Debug/GetCssSourcesCest.php b/tests/unit/Support/Debug/GetCssSourcesCest.php
index 2efed4f0c0b..a31f7f8a23c 100644
--- a/tests/unit/Support/Debug/GetCssSourcesCest.php
+++ b/tests/unit/Support/Debug/GetCssSourcesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use Phalcon\Support\Debug;
 use UnitTester;
diff --git a/tests/unit/Support/Debug/GetJsSourcesCest.php b/tests/unit/Support/Debug/GetJsSourcesCest.php
index 826aba69277..98493884069 100644
--- a/tests/unit/Support/Debug/GetJsSourcesCest.php
+++ b/tests/unit/Support/Debug/GetJsSourcesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use Phalcon\Support\Debug;
 use UnitTester;
diff --git a/tests/unit/Support/Debug/GetVersionCest.php b/tests/unit/Support/Debug/GetVersionCest.php
index 1558b70c509..41f690c8338 100644
--- a/tests/unit/Support/Debug/GetVersionCest.php
+++ b/tests/unit/Support/Debug/GetVersionCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use Phalcon\Support\Debug;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Support\Version;
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/ListenExceptionsCest.php b/tests/unit/Support/Debug/ListenExceptionsCest.php
index 3d353f3c6d6..5cb25f2ffde 100644
--- a/tests/unit/Support/Debug/ListenExceptionsCest.php
+++ b/tests/unit/Support/Debug/ListenExceptionsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/ListenLowSeverityCest.php b/tests/unit/Support/Debug/ListenLowSeverityCest.php
index 44ebc31e1da..32793b7d2d2 100644
--- a/tests/unit/Support/Debug/ListenLowSeverityCest.php
+++ b/tests/unit/Support/Debug/ListenLowSeverityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/OnUncaughtExceptionCest.php b/tests/unit/Support/Debug/OnUncaughtExceptionCest.php
index 53f913eb9d0..0e7774a8f3f 100644
--- a/tests/unit/Support/Debug/OnUncaughtExceptionCest.php
+++ b/tests/unit/Support/Debug/OnUncaughtExceptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/OnUncaughtLowSeverityCest.php b/tests/unit/Support/Debug/OnUncaughtLowSeverityCest.php
index 22ef768a525..fb9ca7ceb75 100644
--- a/tests/unit/Support/Debug/OnUncaughtLowSeverityCest.php
+++ b/tests/unit/Support/Debug/OnUncaughtLowSeverityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/RenderHtmlCest.php b/tests/unit/Support/Debug/RenderHtmlCest.php
index 20b15a21acf..226d418678e 100644
--- a/tests/unit/Support/Debug/RenderHtmlCest.php
+++ b/tests/unit/Support/Debug/RenderHtmlCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use Phalcon\Exception;
 use Phalcon\Support\Debug;
diff --git a/tests/unit/Support/Debug/SetShowBackTraceCest.php b/tests/unit/Support/Debug/SetShowBackTraceCest.php
index d49a0ee2535..b4ccacd29de 100644
--- a/tests/unit/Support/Debug/SetShowBackTraceCest.php
+++ b/tests/unit/Support/Debug/SetShowBackTraceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/SetShowFilesCest.php b/tests/unit/Support/Debug/SetShowFilesCest.php
index 16e0be7a9b2..91548eaf4f5 100644
--- a/tests/unit/Support/Debug/SetShowFilesCest.php
+++ b/tests/unit/Support/Debug/SetShowFilesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use UnitTester;
 
diff --git a/tests/unit/Support/Debug/SetUriCest.php b/tests/unit/Support/Debug/SetUriCest.php
index 5c6d1494429..65a483d1dd5 100644
--- a/tests/unit/Support/Debug/SetUriCest.php
+++ b/tests/unit/Support/Debug/SetUriCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Debug;
+namespace Phalcon\Tests\Unit\Support\Debug;
 
 use Phalcon\Support\Debug;
 use UnitTester;
diff --git a/tests/unit/Support/Helper/Str/Interpolate/InvokeCest.php b/tests/unit/Support/Helper/Str/Interpolate/InvokeCest.php
index 11e7498c5ea..873db77a309 100644
--- a/tests/unit/Support/Helper/Str/Interpolate/InvokeCest.php
+++ b/tests/unit/Support/Helper/Str/Interpolate/InvokeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Helper\Str\Interpolate;
+namespace Phalcon\Tests\Unit\Support\Helper\Str\Interpolate;
 
 use Codeception\Example;
 use Phalcon\Support\Helper\Str\Interpolate;
diff --git a/tests/unit/Support/HelperFactory/CallCest.php b/tests/unit/Support/HelperFactory/CallCest.php
index fda17f2f7cd..a62164ba0c1 100644
--- a/tests/unit/Support/HelperFactory/CallCest.php
+++ b/tests/unit/Support/HelperFactory/CallCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\HelperFactory;
+namespace Phalcon\Tests\Unit\Support\HelperFactory;
 
 use Phalcon\Support\HelperFactory;
 use Phalcon\Support\Helper\Str\Interpolate;
diff --git a/tests/unit/Support/HelperFactory/NewInstanceCest.php b/tests/unit/Support/HelperFactory/NewInstanceCest.php
index 617c3094213..4fc568255e1 100644
--- a/tests/unit/Support/HelperFactory/NewInstanceCest.php
+++ b/tests/unit/Support/HelperFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\HelperFactory;
+namespace Phalcon\Tests\Unit\Support\HelperFactory;
 
 use Codeception\Example;
 use Phalcon\Support\HelperFactory;
diff --git a/tests/unit/Support/Version/ConstantsCest.php b/tests/unit/Support/Version/ConstantsCest.php
index f8aa7c5bb48..f9d842689ae 100644
--- a/tests/unit/Support/Version/ConstantsCest.php
+++ b/tests/unit/Support/Version/ConstantsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Version;
+namespace Phalcon\Tests\Unit\Support\Version;
 
 use Phalcon\Support\Version;
 use UnitTester;
diff --git a/tests/unit/Support/Version/GetCest.php b/tests/unit/Support/Version/GetCest.php
index b0da5479c01..7563e35baf9 100644
--- a/tests/unit/Support/Version/GetCest.php
+++ b/tests/unit/Support/Version/GetCest.php
@@ -11,9 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Version;
+namespace Phalcon\Tests\Unit\Support\Version;
 
-use Phalcon\Test\Fixtures\Traits\VersionTrait;
+use Codeception\Example;
+use Codeception\Util\Stub;
+use Phalcon\Tests\Fixtures\Support\Version\VersionAlphaFixture;
+use Phalcon\Tests\Fixtures\Support\Version\VersionBetaFixture;
+use Phalcon\Tests\Fixtures\Support\Version\VersionRcFixture;
+use Phalcon\Tests\Fixtures\Support\Version\VersionStableFixture;
 use Phalcon\Support\Version;
 use UnitTester;
 
@@ -21,49 +26,60 @@
 
 class GetCest
 {
-    use VersionTrait;
-
     /**
-     * Tests Phalcon\Support\Version :: get()
+     * Tests get()
+     *
+     * @dataProvider getExamples
+     *
+     * @param UnitTester $I
+     * @param Example    $example
      *
      * @author Phalcon Team <team@phalcon.io>
      * @since  2018-11-13
      */
-    public function supportVersionGet(UnitTester $I)
+    public function supportVersionGet(UnitTester $I, Example $example)
     {
-        $I->wantToTest('Version - get()');
+        $I->wantToTest('Version - get() - ' . $example[0]);
 
-        $version = (new Version())->get();
+        $version = Stub::make(
+            Version::class,
+            [
+                'getVersion' => $example[2]
+            ]
+        );
 
-        $I->assertTrue(is_string($version));
+        $expected = $example[1];
+        $actual   = $version->get();
+        $I->assertTrue(is_string($actual));
+        $I->assertEquals($expected, $actual);
     }
 
     /**
-     * Tests the getId() translation to get()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @return string[][]
      */
-    public function supportVersionGetIdToGet(UnitTester $I)
+    private function getExamples(): array
     {
-        $I->wantToTest('Version - getId() to get()');
-
-        $version = new Version();
-        $id      = $version->getId();
-
-        $major     = intval($id[0]);
-        $med       = intval($id[1] . $id[2]);
-        $min       = intval($id[3] . $id[4]);
-        $special   = $this->numberToSpecial($id[5]);
-        $specialNo = ($special) ? $id[6] : '';
-        $expected  = "{$major}.{$med}.{$min}";
-        if (true !== empty($special)) {
-            $expected .= "{$special}";
-            if (true !== empty($specialNo)) {
-                $expected .= "{$specialNo}";
-            }
-        }
-
-        $I->assertEquals(trim($expected), $version->get());
+        return [
+            [
+                'alpha',
+                '5.0.0alpha1',
+                [5, 0, 0, 1, 1]
+            ],
+            [
+                'beta',
+                '5.0.0beta2',
+                [5, 0, 0, 2, 2]
+            ],
+            [
+                'rc',
+                '5.0.0RC3',
+                [5, 0, 0, 3, 3]
+            ],
+            [
+                'stable',
+                '5.0.0',
+                [5, 0, 0, 4, 0]
+            ],
+        ];
     }
 }
diff --git a/tests/unit/Support/Version/GetIdCest.php b/tests/unit/Support/Version/GetIdCest.php
index 741a1ee2a47..e29e21b049f 100644
--- a/tests/unit/Support/Version/GetIdCest.php
+++ b/tests/unit/Support/Version/GetIdCest.php
@@ -11,10 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Version;
+namespace Phalcon\Tests\Unit\Support\Version;
 
-use Phalcon\Test\Fixtures\Traits\VersionTrait;
-use Phalcon\Support\Version;
+use Codeception\Example;
+use Phalcon\Tests\Fixtures\Traits\VersionTrait;
+use Phalcon\Tests\Fixtures\Support\Version\VersionAlphaFixture;
+use Phalcon\Tests\Fixtures\Support\Version\VersionBetaFixture;
+use Phalcon\Tests\Fixtures\Support\Version\VersionRcFixture;
+use Phalcon\Tests\Fixtures\Support\Version\VersionStableFixture;
 use UnitTester;
 
 use function is_string;
@@ -24,54 +28,54 @@ class GetIdCest
     use VersionTrait;
 
     /**
-     * Tests Phalcon\Support\Version :: getId()
+     * Tests get()
+     *
+     * @dataProvider getExamples
+     *
+     * @param UnitTester $I
+     * @param Example    $example
      *
      * @author Phalcon Team <team@phalcon.io>
      * @since  2018-11-13
      */
-    public function supportVersionGetId(UnitTester $I)
+    public function supportVersionGetId(UnitTester $I, Example $example)
     {
-        $I->wantToTest('Version - getId()');
+        $I->wantToTest('Version - getId() - ' . $example[0]);
+
+        $version = new $example[1]();
 
-        $version = new Version();
-        $I->assertTrue(is_string($version->getId()));
+        $expected = $example[2];
+        $actual   = $version->getId();
+        $I->assertTrue(is_string($actual));
+        $I->assertEquals($expected, $actual);
     }
 
     /**
-     * Tests the get() translation to getId()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @return string[][]
      */
-    public function supportVersionGetToGetId(UnitTester $I)
+    private function getExamples(): array
     {
-        $I->wantToTest('Version - get() to getId()');
-
-        $object  = new Version();
-        $version = $object->get();
-        $chunks  = preg_split('/(alpha|beta|RC)/', $version);
-
-        $special   = '4';
-        $specialNo = '0';
-
-        // There are pre-release version parts (eg. 4.0.0alpha2)
-        if (count($chunks) > 1) {
-            preg_match('/(alpha|beta|RC)/', $version, $stages);
-            $special = $this->specialToNumber($stages[0]);
-            if (!empty($chunks[1])) { // 4.0.0alpha
-                $specialNo = $chunks[1];
-            }
-        }
-
-        // Now the version itself
-        $verChunks = explode('.', $chunks[0]);
-        $major     = intval($verChunks[0]);
-        $med       = substr('00' . intval($verChunks[1]), -2);
-        $min       = substr('00' . intval($verChunks[2]), -2);
-
-        $I->assertEquals(
-            "{$major}{$med}{$min}{$special}{$specialNo}",
-            $object->getId()
-        );
+        return [
+            [
+                'alpha',
+                VersionAlphaFixture::class,
+                '5000011',
+            ],
+            [
+                'beta',
+                VersionBetaFixture::class,
+                '5000022',
+            ],
+            [
+                'rc',
+                VersionRcFixture::class,
+                '5000033',
+            ],
+            [
+                'stable',
+                VersionStableFixture::class,
+                '5000000',
+            ],
+        ];
     }
 }
diff --git a/tests/unit/Support/Version/GetPartCest.php b/tests/unit/Support/Version/GetPartCest.php
index d17b79176f7..8d4e647f47f 100644
--- a/tests/unit/Support/Version/GetPartCest.php
+++ b/tests/unit/Support/Version/GetPartCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Support\Version;
+namespace Phalcon\Tests\Unit\Support\Version;
 
-use Phalcon\Test\Fixtures\Traits\VersionTrait;
 use Phalcon\Support\Version;
+use Phalcon\Tests\Fixtures\Traits\VersionTrait;
 use UnitTester;
 
 class GetPartCest
@@ -39,7 +39,7 @@ public function supportVersionGetPart(UnitTester $I)
          */
 
         $version = new Version();
-        $id = $version->getId();
+        $id      = $version->getId();
 
         // The major version is the first digit
         $I->assertEquals(
diff --git a/tests/unit/Tag/AppendTitleCest.php b/tests/unit/Tag/AppendTitleCest.php
index 90d3569bce5..d4b9399251f 100644
--- a/tests/unit/Tag/AppendTitleCest.php
+++ b/tests/unit/Tag/AppendTitleCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class AppendTitleCest extends TagSetup
diff --git a/tests/unit/Tag/CheckFieldCest.php b/tests/unit/Tag/CheckFieldCest.php
index c6cd4dad76d..6bdd6c22193 100644
--- a/tests/unit/Tag/CheckFieldCest.php
+++ b/tests/unit/Tag/CheckFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 use UnitTester;
 
 class CheckFieldCest extends TagHelper
diff --git a/tests/unit/Tag/ColorFieldCest.php b/tests/unit/Tag/ColorFieldCest.php
index f1558b24514..51cb210fb0b 100644
--- a/tests/unit/Tag/ColorFieldCest.php
+++ b/tests/unit/Tag/ColorFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class ColorFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/DateFieldCest.php b/tests/unit/Tag/DateFieldCest.php
index 620788b7a30..727343ec633 100644
--- a/tests/unit/Tag/DateFieldCest.php
+++ b/tests/unit/Tag/DateFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class DateFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/DateTimeFieldCest.php b/tests/unit/Tag/DateTimeFieldCest.php
index 9e41950301d..45585f8a00b 100644
--- a/tests/unit/Tag/DateTimeFieldCest.php
+++ b/tests/unit/Tag/DateTimeFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class DateTimeFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/DateTimeLocalFieldCest.php b/tests/unit/Tag/DateTimeLocalFieldCest.php
index f52505cd2f1..d9a658d9a01 100644
--- a/tests/unit/Tag/DateTimeLocalFieldCest.php
+++ b/tests/unit/Tag/DateTimeLocalFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class DateTimeLocalFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/DisplayToCest.php b/tests/unit/Tag/DisplayToCest.php
index 11b1a5e83b0..75a565d5f7b 100644
--- a/tests/unit/Tag/DisplayToCest.php
+++ b/tests/unit/Tag/DisplayToCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class DisplayToCest extends TagSetup
diff --git a/tests/unit/Tag/EmailFieldCest.php b/tests/unit/Tag/EmailFieldCest.php
index 604c089bd9b..ff7ae2c91ff 100644
--- a/tests/unit/Tag/EmailFieldCest.php
+++ b/tests/unit/Tag/EmailFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class EmailFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/EndFormCest.php b/tests/unit/Tag/EndFormCest.php
index 685e2074dac..7e1da6ac869 100644
--- a/tests/unit/Tag/EndFormCest.php
+++ b/tests/unit/Tag/EndFormCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class EndFormCest extends TagSetup
diff --git a/tests/unit/Tag/FileFieldCest.php b/tests/unit/Tag/FileFieldCest.php
index 5a5eca88708..6c57463d1c2 100644
--- a/tests/unit/Tag/FileFieldCest.php
+++ b/tests/unit/Tag/FileFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class FileFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/FormCest.php b/tests/unit/Tag/FormCest.php
index 281db7957cf..d9b92c381f4 100644
--- a/tests/unit/Tag/FormCest.php
+++ b/tests/unit/Tag/FormCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class FormCest extends TagSetup
diff --git a/tests/unit/Tag/FriendlyTitleCest.php b/tests/unit/Tag/FriendlyTitleCest.php
index 6a5913d2469..23607c147d7 100644
--- a/tests/unit/Tag/FriendlyTitleCest.php
+++ b/tests/unit/Tag/FriendlyTitleCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use Phalcon\Tag\Exception;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class FriendlyTitleCest extends TagSetup
diff --git a/tests/unit/Tag/GetDocTypeCest.php b/tests/unit/Tag/GetDocTypeCest.php
index 5937527a516..455675c65e8 100644
--- a/tests/unit/Tag/GetDocTypeCest.php
+++ b/tests/unit/Tag/GetDocTypeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class GetDocTypeCest extends TagSetup
diff --git a/tests/unit/Tag/GetEscaperCest.php b/tests/unit/Tag/GetEscaperCest.php
index 8e3517e867e..b7a1fe87c2f 100644
--- a/tests/unit/Tag/GetEscaperCest.php
+++ b/tests/unit/Tag/GetEscaperCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Escaper;
 use Phalcon\Escaper\EscaperInterface;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class GetEscaperCest extends TagSetup
diff --git a/tests/unit/Tag/GetEscaperServiceCest.php b/tests/unit/Tag/GetEscaperServiceCest.php
index a638c508648..71404b3c433 100644
--- a/tests/unit/Tag/GetEscaperServiceCest.php
+++ b/tests/unit/Tag/GetEscaperServiceCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Escaper;
 use Phalcon\Escaper\EscaperInterface;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class GetEscaperServiceCest extends TagSetup
diff --git a/tests/unit/Tag/GetHasValueCest.php b/tests/unit/Tag/GetHasValueCest.php
index 500001c178a..be82155828d 100644
--- a/tests/unit/Tag/GetHasValueCest.php
+++ b/tests/unit/Tag/GetHasValueCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 use function uniqid;
diff --git a/tests/unit/Tag/GetSetDICest.php b/tests/unit/Tag/GetSetDICest.php
index 813a5e75a77..698fe518020 100644
--- a/tests/unit/Tag/GetSetDICest.php
+++ b/tests/unit/Tag/GetSetDICest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Di;
 use Phalcon\Tag;
diff --git a/tests/unit/Tag/GetSetTitleSeparatorCest.php b/tests/unit/Tag/GetSetTitleSeparatorCest.php
index 3c978f92f80..bc6004b915b 100644
--- a/tests/unit/Tag/GetSetTitleSeparatorCest.php
+++ b/tests/unit/Tag/GetSetTitleSeparatorCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use UnitTester;
diff --git a/tests/unit/Tag/GetTitleCest.php b/tests/unit/Tag/GetTitleCest.php
index 950a96d4a40..6c775f0d24e 100644
--- a/tests/unit/Tag/GetTitleCest.php
+++ b/tests/unit/Tag/GetTitleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use UnitTester;
diff --git a/tests/unit/Tag/GetUrlServiceCest.php b/tests/unit/Tag/GetUrlServiceCest.php
index ebf40e79b99..f002f9404fe 100644
--- a/tests/unit/Tag/GetUrlServiceCest.php
+++ b/tests/unit/Tag/GetUrlServiceCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use Phalcon\Url;
 use UnitTester;
 
diff --git a/tests/unit/Tag/HiddenFieldCest.php b/tests/unit/Tag/HiddenFieldCest.php
index 1075bc9d140..2fb749655a7 100644
--- a/tests/unit/Tag/HiddenFieldCest.php
+++ b/tests/unit/Tag/HiddenFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class HiddenFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/ImageCest.php b/tests/unit/Tag/ImageCest.php
index 1f9056cf564..7fddcb31135 100644
--- a/tests/unit/Tag/ImageCest.php
+++ b/tests/unit/Tag/ImageCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class ImageCest extends TagSetup
diff --git a/tests/unit/Tag/ImageInputCest.php b/tests/unit/Tag/ImageInputCest.php
index d72e014487f..4277ca69a67 100644
--- a/tests/unit/Tag/ImageInputCest.php
+++ b/tests/unit/Tag/ImageInputCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class ImageInputCest extends TagSetup
diff --git a/tests/unit/Tag/JavascriptIncludeCest.php b/tests/unit/Tag/JavascriptIncludeCest.php
index 7be6de5772b..f3df873aa54 100644
--- a/tests/unit/Tag/JavascriptIncludeCest.php
+++ b/tests/unit/Tag/JavascriptIncludeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class JavascriptIncludeCest extends TagSetup
diff --git a/tests/unit/Tag/LinkToCest.php b/tests/unit/Tag/LinkToCest.php
index 536a40fb9ff..261d5af3930 100644
--- a/tests/unit/Tag/LinkToCest.php
+++ b/tests/unit/Tag/LinkToCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class LinkToCest extends TagSetup
diff --git a/tests/unit/Tag/MonthFieldCest.php b/tests/unit/Tag/MonthFieldCest.php
index ea408fca431..a65d1337a30 100644
--- a/tests/unit/Tag/MonthFieldCest.php
+++ b/tests/unit/Tag/MonthFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class MonthFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/NumericFieldCest.php b/tests/unit/Tag/NumericFieldCest.php
index 3f817c519d3..1d3bdf242b8 100644
--- a/tests/unit/Tag/NumericFieldCest.php
+++ b/tests/unit/Tag/NumericFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class NumericFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/PasswordFieldCest.php b/tests/unit/Tag/PasswordFieldCest.php
index 02dd9c3c4f3..452302e1c07 100644
--- a/tests/unit/Tag/PasswordFieldCest.php
+++ b/tests/unit/Tag/PasswordFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class PasswordFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/PreloadCest.php b/tests/unit/Tag/PreloadCest.php
index 4863f89a85e..d614d07556e 100644
--- a/tests/unit/Tag/PreloadCest.php
+++ b/tests/unit/Tag/PreloadCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Http\Response;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use UnitTester;
 
 class PreloadCest
diff --git a/tests/unit/Tag/PrependTitleCest.php b/tests/unit/Tag/PrependTitleCest.php
index 54d668ec861..53e89379aca 100644
--- a/tests/unit/Tag/PrependTitleCest.php
+++ b/tests/unit/Tag/PrependTitleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use UnitTester;
diff --git a/tests/unit/Tag/RadioFieldCest.php b/tests/unit/Tag/RadioFieldCest.php
index 874b726d097..0fda167a2b0 100644
--- a/tests/unit/Tag/RadioFieldCest.php
+++ b/tests/unit/Tag/RadioFieldCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class RadioFieldCest extends TagSetup
diff --git a/tests/unit/Tag/RangeFieldCest.php b/tests/unit/Tag/RangeFieldCest.php
index 77a85af0476..129b9f77223 100644
--- a/tests/unit/Tag/RangeFieldCest.php
+++ b/tests/unit/Tag/RangeFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class RangeFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/RenderAttributesCest.php b/tests/unit/Tag/RenderAttributesCest.php
index 1993dfe27d3..87301a9e87f 100644
--- a/tests/unit/Tag/RenderAttributesCest.php
+++ b/tests/unit/Tag/RenderAttributesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class RenderAttributesCest extends TagSetup
diff --git a/tests/unit/Tag/RenderTitleCest.php b/tests/unit/Tag/RenderTitleCest.php
index 36121f9d5fa..1f98ceb483f 100644
--- a/tests/unit/Tag/RenderTitleCest.php
+++ b/tests/unit/Tag/RenderTitleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use UnitTester;
diff --git a/tests/unit/Tag/ResetInputCest.php b/tests/unit/Tag/ResetInputCest.php
index 9eca50e1bcf..437a7272696 100644
--- a/tests/unit/Tag/ResetInputCest.php
+++ b/tests/unit/Tag/ResetInputCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use UnitTester;
diff --git a/tests/unit/Tag/SearchFieldCest.php b/tests/unit/Tag/SearchFieldCest.php
index 0b23dc8997a..0dcd735434c 100644
--- a/tests/unit/Tag/SearchFieldCest.php
+++ b/tests/unit/Tag/SearchFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class SearchFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/Select/SelectFieldCest.php b/tests/unit/Tag/Select/SelectFieldCest.php
index c4691397c8f..012e982171d 100644
--- a/tests/unit/Tag/Select/SelectFieldCest.php
+++ b/tests/unit/Tag/Select/SelectFieldCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag\Select;
+namespace Phalcon\Tests\Unit\Tag\Select;
 
 use Phalcon\Tag\Select;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SelectFieldCest extends TagSetup
diff --git a/tests/unit/Tag/SelectCest.php b/tests/unit/Tag/SelectCest.php
index f8f8510a0cc..3b476d0a8b6 100644
--- a/tests/unit/Tag/SelectCest.php
+++ b/tests/unit/Tag/SelectCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SelectCest extends TagSetup
diff --git a/tests/unit/Tag/SelectStaticCest.php b/tests/unit/Tag/SelectStaticCest.php
index 64c7ae2a500..d5dc2fdc8dd 100644
--- a/tests/unit/Tag/SelectStaticCest.php
+++ b/tests/unit/Tag/SelectStaticCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SelectStaticCest extends TagSetup
diff --git a/tests/unit/Tag/SetDefaultCest.php b/tests/unit/Tag/SetDefaultCest.php
index 357d26a22b6..314cb197c24 100644
--- a/tests/unit/Tag/SetDefaultCest.php
+++ b/tests/unit/Tag/SetDefaultCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SetDefaultCest extends TagSetup
diff --git a/tests/unit/Tag/SetDefaultsCest.php b/tests/unit/Tag/SetDefaultsCest.php
index 99c7854266b..dd165f03167 100644
--- a/tests/unit/Tag/SetDefaultsCest.php
+++ b/tests/unit/Tag/SetDefaultsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SetDefaultsCest extends TagSetup
diff --git a/tests/unit/Tag/SetDocTypeCest.php b/tests/unit/Tag/SetDocTypeCest.php
index b6ebdea3581..18cdcb9e0a8 100644
--- a/tests/unit/Tag/SetDocTypeCest.php
+++ b/tests/unit/Tag/SetDocTypeCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SetDocTypeCest extends TagSetup
diff --git a/tests/unit/Tag/SetTitleCest.php b/tests/unit/Tag/SetTitleCest.php
index 6611236c750..6d977c43724 100644
--- a/tests/unit/Tag/SetTitleCest.php
+++ b/tests/unit/Tag/SetTitleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
 use UnitTester;
diff --git a/tests/unit/Tag/StylesheetLinkCest.php b/tests/unit/Tag/StylesheetLinkCest.php
index 73d935e1fec..cf992244867 100644
--- a/tests/unit/Tag/StylesheetLinkCest.php
+++ b/tests/unit/Tag/StylesheetLinkCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class StylesheetLinkCest extends TagSetup
diff --git a/tests/unit/Tag/SubmitButtonCest.php b/tests/unit/Tag/SubmitButtonCest.php
index 6ac9721ca97..bba8ae5904e 100644
--- a/tests/unit/Tag/SubmitButtonCest.php
+++ b/tests/unit/Tag/SubmitButtonCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class SubmitButtonCest extends TagSetup
diff --git a/tests/unit/Tag/TagHtmlCest.php b/tests/unit/Tag/TagHtmlCest.php
index 1781c3f5011..2a2d0b57610 100644
--- a/tests/unit/Tag/TagHtmlCest.php
+++ b/tests/unit/Tag/TagHtmlCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Codeception\Example;
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class TagHtmlCest extends TagSetup
diff --git a/tests/unit/Tag/TagHtmlCloseCest.php b/tests/unit/Tag/TagHtmlCloseCest.php
index 45fb93afc19..15250ba520b 100644
--- a/tests/unit/Tag/TagHtmlCloseCest.php
+++ b/tests/unit/Tag/TagHtmlCloseCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class TagHtmlCloseCest extends TagSetup
diff --git a/tests/unit/Tag/TelFieldCest.php b/tests/unit/Tag/TelFieldCest.php
index f9cd40e75dd..b096f1da48e 100644
--- a/tests/unit/Tag/TelFieldCest.php
+++ b/tests/unit/Tag/TelFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class TelFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/TextAreaCest.php b/tests/unit/Tag/TextAreaCest.php
index 2302d9c4329..9515f7391dc 100644
--- a/tests/unit/Tag/TextAreaCest.php
+++ b/tests/unit/Tag/TextAreaCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
 use Phalcon\Tag;
-use Phalcon\Test\Fixtures\Helpers\TagSetup;
+use Phalcon\Tests\Fixtures\Helpers\TagSetup;
 use UnitTester;
 
 class TextAreaCest extends TagSetup
diff --git a/tests/unit/Tag/TextFieldCest.php b/tests/unit/Tag/TextFieldCest.php
index fdb15657982..36ffc584774 100644
--- a/tests/unit/Tag/TextFieldCest.php
+++ b/tests/unit/Tag/TextFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class TextFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/TimeFieldCest.php b/tests/unit/Tag/TimeFieldCest.php
index 68e4d6a7d86..daf48972588 100644
--- a/tests/unit/Tag/TimeFieldCest.php
+++ b/tests/unit/Tag/TimeFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class TimeFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/UrlFieldCest.php b/tests/unit/Tag/UrlFieldCest.php
index b97e9573ef7..b8a3dff7e2b 100644
--- a/tests/unit/Tag/UrlFieldCest.php
+++ b/tests/unit/Tag/UrlFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class UrlFieldCest extends TagHelper
 {
diff --git a/tests/unit/Tag/WeekFieldCest.php b/tests/unit/Tag/WeekFieldCest.php
index e9e43553185..e6853bb038b 100644
--- a/tests/unit/Tag/WeekFieldCest.php
+++ b/tests/unit/Tag/WeekFieldCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Tag;
+namespace Phalcon\Tests\Unit\Tag;
 
-use Phalcon\Test\Fixtures\Helpers\TagHelper;
+use Phalcon\Tests\Fixtures\Helpers\TagHelper;
 
 class WeekFieldCest extends TagHelper
 {
diff --git a/tests/unit/Text/CamelizeCest.php b/tests/unit/Text/CamelizeCest.php
index 867e1828256..7308c2a1091 100644
--- a/tests/unit/Text/CamelizeCest.php
+++ b/tests/unit/Text/CamelizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Codeception\Example;
 use Phalcon\Text;
diff --git a/tests/unit/Text/ConcatCest.php b/tests/unit/Text/ConcatCest.php
index 265ea80e547..2cfa3ca5815 100644
--- a/tests/unit/Text/ConcatCest.php
+++ b/tests/unit/Text/ConcatCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/DynamicCest.php b/tests/unit/Text/DynamicCest.php
index a4ff7149d76..1efda50ffa6 100644
--- a/tests/unit/Text/DynamicCest.php
+++ b/tests/unit/Text/DynamicCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/EndsWithCest.php b/tests/unit/Text/EndsWithCest.php
index 912a31264ee..1ff55385460 100644
--- a/tests/unit/Text/EndsWithCest.php
+++ b/tests/unit/Text/EndsWithCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/HumanizeCest.php b/tests/unit/Text/HumanizeCest.php
index 971556e4dc8..b49151f9525 100644
--- a/tests/unit/Text/HumanizeCest.php
+++ b/tests/unit/Text/HumanizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Codeception\Example;
 use Phalcon\Text;
diff --git a/tests/unit/Text/IncrementCest.php b/tests/unit/Text/IncrementCest.php
index 8c46913a8f9..529bb63a56d 100644
--- a/tests/unit/Text/IncrementCest.php
+++ b/tests/unit/Text/IncrementCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/LowerCest.php b/tests/unit/Text/LowerCest.php
index 03bb56d8c0f..42085788d36 100644
--- a/tests/unit/Text/LowerCest.php
+++ b/tests/unit/Text/LowerCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/RandomCest.php b/tests/unit/Text/RandomCest.php
index 5446e5a552e..b0444a79ba7 100644
--- a/tests/unit/Text/RandomCest.php
+++ b/tests/unit/Text/RandomCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Codeception\Example;
 use Phalcon\Text;
diff --git a/tests/unit/Text/ReduceSlashesCest.php b/tests/unit/Text/ReduceSlashesCest.php
index 48835d01caa..bad9b6892a9 100644
--- a/tests/unit/Text/ReduceSlashesCest.php
+++ b/tests/unit/Text/ReduceSlashesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Codeception\Example;
 use Phalcon\Text;
diff --git a/tests/unit/Text/StartsWithCest.php b/tests/unit/Text/StartsWithCest.php
index d3527f8c7ec..195b7dfec94 100644
--- a/tests/unit/Text/StartsWithCest.php
+++ b/tests/unit/Text/StartsWithCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/UncamelizeCest.php b/tests/unit/Text/UncamelizeCest.php
index e8f76ae0e39..9b021fda8b4 100644
--- a/tests/unit/Text/UncamelizeCest.php
+++ b/tests/unit/Text/UncamelizeCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Codeception\Example;
 use Phalcon\Text;
diff --git a/tests/unit/Text/UnderscoreCest.php b/tests/unit/Text/UnderscoreCest.php
index 056871ac411..b01a4c18f9c 100644
--- a/tests/unit/Text/UnderscoreCest.php
+++ b/tests/unit/Text/UnderscoreCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Text/UpperCest.php b/tests/unit/Text/UpperCest.php
index d289ea35500..d541003ff73 100644
--- a/tests/unit/Text/UpperCest.php
+++ b/tests/unit/Text/UpperCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Text;
+namespace Phalcon\Tests\Unit\Text;
 
 use Phalcon\Text;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Csv/ArrayAccessCest.php b/tests/unit/Translate/Adapter/Csv/ArrayAccessCest.php
index fe0370b185d..448569f0576 100644
--- a/tests/unit/Translate/Adapter/Csv/ArrayAccessCest.php
+++ b/tests/unit/Translate/Adapter/Csv/ArrayAccessCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Csv/ConstructCest.php b/tests/unit/Translate/Adapter/Csv/ConstructCest.php
index 89c251910fe..fa389ad1e48 100644
--- a/tests/unit/Translate/Adapter/Csv/ConstructCest.php
+++ b/tests/unit/Translate/Adapter/Csv/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
 use ArrayAccess;
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\AdapterInterface;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\Exception;
diff --git a/tests/unit/Translate/Adapter/Csv/ExistsCest.php b/tests/unit/Translate/Adapter/Csv/ExistsCest.php
index cc9cf12ba8b..d08ef4488f5 100644
--- a/tests/unit/Translate/Adapter/Csv/ExistsCest.php
+++ b/tests/unit/Translate/Adapter/Csv/ExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Csv/OffsetExistsCest.php b/tests/unit/Translate/Adapter/Csv/OffsetExistsCest.php
index f9fd37ec408..af749e2267b 100644
--- a/tests/unit/Translate/Adapter/Csv/OffsetExistsCest.php
+++ b/tests/unit/Translate/Adapter/Csv/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Csv/OffsetGetCest.php b/tests/unit/Translate/Adapter/Csv/OffsetGetCest.php
index 0dce965ae6a..1184299908f 100644
--- a/tests/unit/Translate/Adapter/Csv/OffsetGetCest.php
+++ b/tests/unit/Translate/Adapter/Csv/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php b/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php
index 47bd37abbc2..a19555f852d 100644
--- a/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php
+++ b/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php b/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php
index dd419754c85..25c6100c1e3 100644
--- a/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php
+++ b/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/Csv/QueryCest.php b/tests/unit/Translate/Adapter/Csv/QueryCest.php
index 57e0487925c..6565f16622e 100644
--- a/tests/unit/Translate/Adapter/Csv/QueryCest.php
+++ b/tests/unit/Translate/Adapter/Csv/QueryCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateCsvHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateCsvHelper;
 
 class QueryCest extends TranslateCsvHelper
 {
diff --git a/tests/unit/Translate/Adapter/Csv/TCest.php b/tests/unit/Translate/Adapter/Csv/TCest.php
index adfeb7df318..e6abee181af 100644
--- a/tests/unit/Translate/Adapter/Csv/TCest.php
+++ b/tests/unit/Translate/Adapter/Csv/TCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateCsvHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateCsvHelper;
 
 class TCest extends TranslateCsvHelper
 {
diff --git a/tests/unit/Translate/Adapter/Csv/UnderscoreCest.php b/tests/unit/Translate/Adapter/Csv/UnderscoreCest.php
index e246041be61..7550d3dd6f1 100644
--- a/tests/unit/Translate/Adapter/Csv/UnderscoreCest.php
+++ b/tests/unit/Translate/Adapter/Csv/UnderscoreCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Csv;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Csv;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateCsvHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateCsvHelper;
 
 class UnderscoreCest extends TranslateCsvHelper
 {
diff --git a/tests/unit/Translate/Adapter/Gettext/ConstructCest.php b/tests/unit/Translate/Adapter/Gettext/ConstructCest.php
index 1b7725ac7bc..d68ed1155b9 100644
--- a/tests/unit/Translate/Adapter/Gettext/ConstructCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
 use ArrayAccess;
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\AdapterInterface;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\Exception;
diff --git a/tests/unit/Translate/Adapter/Gettext/ExistsCest.php b/tests/unit/Translate/Adapter/Gettext/ExistsCest.php
index 56719fe913b..e7aecb329be 100644
--- a/tests/unit/Translate/Adapter/Gettext/ExistsCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/ExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/GetCategoryCest.php b/tests/unit/Translate/Adapter/Gettext/GetCategoryCest.php
index 970fbd72877..23c71fb3c62 100644
--- a/tests/unit/Translate/Adapter/Gettext/GetCategoryCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/GetCategoryCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/GetSetDefaultDomainCest.php b/tests/unit/Translate/Adapter/Gettext/GetSetDefaultDomainCest.php
index b215031b9db..4be925cd207 100644
--- a/tests/unit/Translate/Adapter/Gettext/GetSetDefaultDomainCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/GetSetDefaultDomainCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/GetSetDirectoryCest.php b/tests/unit/Translate/Adapter/Gettext/GetSetDirectoryCest.php
index 2304fd1adfd..6d62d2c2010 100644
--- a/tests/unit/Translate/Adapter/Gettext/GetSetDirectoryCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/GetSetDirectoryCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/GetSetLocaleCest.php b/tests/unit/Translate/Adapter/Gettext/GetSetLocaleCest.php
index 542a1f1e2d4..7cdd1e02853 100644
--- a/tests/unit/Translate/Adapter/Gettext/GetSetLocaleCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/GetSetLocaleCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/NqueryCest.php b/tests/unit/Translate/Adapter/Gettext/NqueryCest.php
index e51aa5285d2..7d0e801698b 100644
--- a/tests/unit/Translate/Adapter/Gettext/NqueryCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/NqueryCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/OffsetExistsCest.php b/tests/unit/Translate/Adapter/Gettext/OffsetExistsCest.php
index dafce3dc642..323702cf0c2 100644
--- a/tests/unit/Translate/Adapter/Gettext/OffsetExistsCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/OffsetGetCest.php b/tests/unit/Translate/Adapter/Gettext/OffsetGetCest.php
index cafd46b492d..c1e55b3dd1d 100644
--- a/tests/unit/Translate/Adapter/Gettext/OffsetGetCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/OffsetSetCest.php b/tests/unit/Translate/Adapter/Gettext/OffsetSetCest.php
index 8e9ee449936..541a71fa408 100644
--- a/tests/unit/Translate/Adapter/Gettext/OffsetSetCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/Gettext/OffsetUnsetCest.php b/tests/unit/Translate/Adapter/Gettext/OffsetUnsetCest.php
index a369fe24072..5997ae27fb5 100644
--- a/tests/unit/Translate/Adapter/Gettext/OffsetUnsetCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/Gettext/QueryCest.php b/tests/unit/Translate/Adapter/Gettext/QueryCest.php
index 38977dc846c..5becdb3e763 100644
--- a/tests/unit/Translate/Adapter/Gettext/QueryCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/QueryCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/ResetDomainCest.php b/tests/unit/Translate/Adapter/Gettext/ResetDomainCest.php
index da6c18871e9..aa879035aa8 100644
--- a/tests/unit/Translate/Adapter/Gettext/ResetDomainCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/ResetDomainCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/SetDomainCest.php b/tests/unit/Translate/Adapter/Gettext/SetDomainCest.php
index 0271e4b94e2..d768e5469c9 100644
--- a/tests/unit/Translate/Adapter/Gettext/SetDomainCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/SetDomainCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/Gettext/TCest.php b/tests/unit/Translate/Adapter/Gettext/TCest.php
index e1ef5f33def..16fc78e8847 100644
--- a/tests/unit/Translate/Adapter/Gettext/TCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/TCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateGettextHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateGettextHelper;
 
 class TCest extends TranslateGettextHelper
 {
diff --git a/tests/unit/Translate/Adapter/Gettext/UnderscoreCest.php b/tests/unit/Translate/Adapter/Gettext/UnderscoreCest.php
index 1e63b206abf..3fbd5959a47 100644
--- a/tests/unit/Translate/Adapter/Gettext/UnderscoreCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/UnderscoreCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\Gettext;
+namespace Phalcon\Tests\Unit\Translate\Adapter\Gettext;
 
-use Phalcon\Test\Fixtures\Traits\TranslateGettextTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateGettextTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/NativeArray/ArrayAccessCest.php b/tests/unit/Translate/Adapter/NativeArray/ArrayAccessCest.php
index ebab71aa4b6..7e641369d4f 100644
--- a/tests/unit/Translate/Adapter/NativeArray/ArrayAccessCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/ArrayAccessCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/NativeArray/ConstructCest.php b/tests/unit/Translate/Adapter/NativeArray/ConstructCest.php
index 8ee6d52bd0e..f35cd2cb40a 100644
--- a/tests/unit/Translate/Adapter/NativeArray/ConstructCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/ConstructCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
 use ArrayAccess;
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\AdapterInterface;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\Exception;
diff --git a/tests/unit/Translate/Adapter/NativeArray/ExistsCest.php b/tests/unit/Translate/Adapter/NativeArray/ExistsCest.php
index a516609333e..2d50d6defc2 100644
--- a/tests/unit/Translate/Adapter/NativeArray/ExistsCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/ExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/NativeArray/NotFoundCest.php b/tests/unit/Translate/Adapter/NativeArray/NotFoundCest.php
index 15f78a70a1c..3904ca122f6 100644
--- a/tests/unit/Translate/Adapter/NativeArray/NotFoundCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/NotFoundCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
-use Phalcon\Test\Fixtures\Translate\Adapter\NativeAdapter;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Translate\Adapter\NativeAdapter;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/NativeArray/OffsetExistsCest.php b/tests/unit/Translate/Adapter/NativeArray/OffsetExistsCest.php
index ea252a6f972..a531da4421e 100644
--- a/tests/unit/Translate/Adapter/NativeArray/OffsetExistsCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/OffsetExistsCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/NativeArray/OffsetGetCest.php b/tests/unit/Translate/Adapter/NativeArray/OffsetGetCest.php
index 8eeb9952184..a1608cf4cb4 100644
--- a/tests/unit/Translate/Adapter/NativeArray/OffsetGetCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/OffsetGetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\InterpolatorFactory;
 use UnitTester;
diff --git a/tests/unit/Translate/Adapter/NativeArray/OffsetSetCest.php b/tests/unit/Translate/Adapter/NativeArray/OffsetSetCest.php
index 75a54174763..a3195e4938d 100644
--- a/tests/unit/Translate/Adapter/NativeArray/OffsetSetCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/OffsetSetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/NativeArray/OffsetUnsetCest.php b/tests/unit/Translate/Adapter/NativeArray/OffsetUnsetCest.php
index 772220db591..d7d77b285ad 100644
--- a/tests/unit/Translate/Adapter/NativeArray/OffsetUnsetCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/OffsetUnsetCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Traits\TranslateArrayTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateArrayTrait;
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Adapter/NativeArray/QueryCest.php b/tests/unit/Translate/Adapter/NativeArray/QueryCest.php
index 17c69ff59f1..7fdbfd9c079 100644
--- a/tests/unit/Translate/Adapter/NativeArray/QueryCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/QueryCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateNativeArrayHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateNativeArrayHelper;
 
 class QueryCest extends TranslateNativeArrayHelper
 {
diff --git a/tests/unit/Translate/Adapter/NativeArray/TCest.php b/tests/unit/Translate/Adapter/NativeArray/TCest.php
index c408f9d503b..ac9ddeb44b9 100644
--- a/tests/unit/Translate/Adapter/NativeArray/TCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/TCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateNativeArrayHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateNativeArrayHelper;
 
 class TCest extends TranslateNativeArrayHelper
 {
diff --git a/tests/unit/Translate/Adapter/NativeArray/UnderscoreCest.php b/tests/unit/Translate/Adapter/NativeArray/UnderscoreCest.php
index 4d5fbb994a4..8a5af2541d2 100644
--- a/tests/unit/Translate/Adapter/NativeArray/UnderscoreCest.php
+++ b/tests/unit/Translate/Adapter/NativeArray/UnderscoreCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Adapter\NativeArray;
+namespace Phalcon\Tests\Unit\Translate\Adapter\NativeArray;
 
-use Phalcon\Test\Fixtures\Helpers\TranslateNativeArrayHelper;
+use Phalcon\Tests\Fixtures\Helpers\TranslateNativeArrayHelper;
 
 class UnderscoreCest extends TranslateNativeArrayHelper
 {
diff --git a/tests/unit/Translate/Interpolator/AssociativeArray/ReplacePlaceholdersCest.php b/tests/unit/Translate/Interpolator/AssociativeArray/ReplacePlaceholdersCest.php
index b4e3dced8ea..0b513f7ee13 100644
--- a/tests/unit/Translate/Interpolator/AssociativeArray/ReplacePlaceholdersCest.php
+++ b/tests/unit/Translate/Interpolator/AssociativeArray/ReplacePlaceholdersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Interpolator\AssociativeArray;
+namespace Phalcon\Tests\Unit\Translate\Interpolator\AssociativeArray;
 
 use Phalcon\Translate\Interpolator\AssociativeArray;
 use UnitTester;
diff --git a/tests/unit/Translate/Interpolator/IndexedArray/InterpolatorCest.php b/tests/unit/Translate/Interpolator/IndexedArray/InterpolatorCest.php
index 9f6acd34d71..0c82fa0f178 100644
--- a/tests/unit/Translate/Interpolator/IndexedArray/InterpolatorCest.php
+++ b/tests/unit/Translate/Interpolator/IndexedArray/InterpolatorCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Unit\Translate\Interpolator\IndexedArray;
+namespace Phalcon\Tests\Unit\Translate\Interpolator\IndexedArray;
 
 use Phalcon\Translate\Adapter\NativeArray;
 use Phalcon\Translate\InterpolatorFactory;
diff --git a/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php b/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php
index 080e9d09695..a1bcf57c85d 100644
--- a/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php
+++ b/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\Interpolator\IndexedArray;
+namespace Phalcon\Tests\Unit\Translate\Interpolator\IndexedArray;
 
 use Phalcon\Translate\Interpolator\IndexedArray;
 use UnitTester;
diff --git a/tests/unit/Translate/InterpolatorFactory/NewInstanceCest.php b/tests/unit/Translate/InterpolatorFactory/NewInstanceCest.php
index 6803493a846..91d0fe18295 100644
--- a/tests/unit/Translate/InterpolatorFactory/NewInstanceCest.php
+++ b/tests/unit/Translate/InterpolatorFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\InterpolatorFactory;
+namespace Phalcon\Tests\Unit\Translate\InterpolatorFactory;
 
 use Codeception\Example;
 use Phalcon\Translate\Exception;
diff --git a/tests/unit/Translate/TranslateFactory/LoadCest.php b/tests/unit/Translate/TranslateFactory/LoadCest.php
index b03aa0928c5..89471205e46 100644
--- a/tests/unit/Translate/TranslateFactory/LoadCest.php
+++ b/tests/unit/Translate/TranslateFactory/LoadCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\TranslateFactory;
+namespace Phalcon\Tests\Unit\Translate\TranslateFactory;
 
-use Phalcon\Test\Fixtures\Traits\FactoryTrait;
+use Phalcon\Tests\Fixtures\Traits\FactoryTrait;
 use Phalcon\Translate\Adapter\Gettext;
 use Phalcon\Translate\InterpolatorFactory;
 use Phalcon\Translate\TranslateFactory;
diff --git a/tests/unit/Translate/TranslateFactory/NewInstanceCest.php b/tests/unit/Translate/TranslateFactory/NewInstanceCest.php
index 62b6cafec98..d0b704301fc 100644
--- a/tests/unit/Translate/TranslateFactory/NewInstanceCest.php
+++ b/tests/unit/Translate/TranslateFactory/NewInstanceCest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit\Translate\TranslateFactory;
+namespace Phalcon\Tests\Unit\Translate\TranslateFactory;
 
-use Phalcon\Test\Fixtures\Traits\TranslateCsvTrait;
+use Phalcon\Tests\Fixtures\Traits\TranslateCsvTrait;
 use Phalcon\Translate\Adapter\AdapterInterface;
 use Phalcon\Translate\Adapter\Csv;
 use Phalcon\Translate\InterpolatorFactory;