diff --git a/tests/integration/Db/Adapter/Pdo/Sqlite/QueryCest.php b/tests/integration/Db/Adapter/Pdo/Sqlite/QueryCest.php
index bf4136ae24b..601efb20d23 100644
--- a/tests/integration/Db/Adapter/Pdo/Sqlite/QueryCest.php
+++ b/tests/integration/Db/Adapter/Pdo/Sqlite/QueryCest.php
@@ -12,6 +12,7 @@
 
 namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
 
+use Phalcon\Db\Enum;
 use IntegrationTester;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 
diff --git a/tests/integration/Forms/Form/GetMessagesCest.php b/tests/integration/Forms/Form/GetMessagesCest.php
index f2ca9cf529a..e65b244e59f 100644
--- a/tests/integration/Forms/Form/GetMessagesCest.php
+++ b/tests/integration/Forms/Form/GetMessagesCest.php
@@ -19,6 +19,7 @@
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\PresenceOf;
 use Phalcon\Validation\Validator\Regex;
 
diff --git a/tests/integration/Forms/Form/IsValidCest.php b/tests/integration/Forms/Form/IsValidCest.php
index e3dc96850c8..88dc271cae0 100644
--- a/tests/integration/Forms/Form/IsValidCest.php
+++ b/tests/integration/Forms/Form/IsValidCest.php
@@ -20,7 +20,7 @@
 use Phalcon\Tag;
 use Phalcon\Test\Fixtures\Forms\ValidationForm;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\PresenceOf;
 use Phalcon\Validation\Validator\Regex;
 
diff --git a/tests/integration/Forms/Form/SetValidationCest.php b/tests/integration/Forms/Form/SetValidationCest.php
index 6745851f777..78c03ab5868 100644
--- a/tests/integration/Forms/Form/SetValidationCest.php
+++ b/tests/integration/Forms/Form/SetValidationCest.php
@@ -19,6 +19,7 @@
 use Phalcon\Messages\Messages;
 use Phalcon\Tag;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Regex;
 
 /**
diff --git a/tests/integration/Mvc/Dispatcher/DispatchCest.php b/tests/integration/Mvc/Dispatcher/DispatchCest.php
index 64a56294372..5d060842ac6 100644
--- a/tests/integration/Mvc/Dispatcher/DispatchCest.php
+++ b/tests/integration/Mvc/Dispatcher/DispatchCest.php
@@ -12,8 +12,8 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher;
 
-use Exception;
 use IntegrationTester;
+use Phalcon\Dispatcher\Exception;
 use Phalcon\Dispatcher\DispatcherInterface;
 use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController;
diff --git a/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php b/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php
index 4089371e745..59c0fba3931 100644
--- a/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php
+++ b/tests/integration/Mvc/Dispatcher/GetHandlerSuffixCest.php
@@ -13,7 +13,6 @@
 namespace Phalcon\Test\Integration\Mvc\Dispatcher;
 
 use IntegrationTester;
-use Phalcon\Dispatcher;
 use Phalcon\Mvc\Dispatcher\Exception;
 use Phalcon\Test\Integration\Mvc\Dispatcher\Helper\BaseDispatcher;
 
@@ -38,7 +37,7 @@ public function mvcDispatcherGetHandlerSuffix(IntegrationTester $I)
         $I->expectThrowable(
             new Exception(
                 'Phalcon\Test\Integration\Mvc\Dispatcher\Helper\IndexBleh handler class cannot be loaded',
-                Dispatcher::EXCEPTION_HANDLER_NOT_FOUND
+                Exception::EXCEPTION_HANDLER_NOT_FOUND
             ),
             function () use ($dispatcher) {
                 $dispatcher->dispatch();
diff --git a/tests/integration/Mvc/Dispatcher/Refactor-DispatcherCest.php b/tests/integration/Mvc/Dispatcher/Refactor-DispatcherCest.php
index 03ae5735e88..51f2864bd53 100644
--- a/tests/integration/Mvc/Dispatcher/Refactor-DispatcherCest.php
+++ b/tests/integration/Mvc/Dispatcher/Refactor-DispatcherCest.php
@@ -3,9 +3,8 @@
 namespace Phalcon\Test\Integration\Mvc\Dispatcher;
 
 use DispatcherTestDefaultNoNamespaceController;
-use Exception;
 use IntegrationTester;
-use Phalcon\Dispatcher;
+use Phalcon\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;
@@ -508,7 +507,7 @@ function ($event, $dispatcher) {
         $I->expectThrowable(
             new Exception(
                 'Dispatcher has detected a cyclic routing causing stability problems',
-                Dispatcher::EXCEPTION_CYCLIC_ROUTING
+                Exception::EXCEPTION_CYCLIC_ROUTING
             ),
             function () use ($dispatcher) {
                 $dispatcher->dispatch();
@@ -540,7 +539,7 @@ function () {
         $I->expectThrowable(
             new Exception(
                 'Invalid handler returned from the services container',
-                Dispatcher::EXCEPTION_INVALID_HANDLER
+                Exception::EXCEPTION_INVALID_HANDLER
             ),
             function () use ($dispatcher) {
                 $dispatcher->dispatch();
diff --git a/tests/integration/Validation/AddCest.php b/tests/integration/Validation/AddCest.php
index 63faeb67aa3..281eb9ad9d8 100644
--- a/tests/integration/Validation/AddCest.php
+++ b/tests/integration/Validation/AddCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Alpha;
 use Phalcon\Validation\Validator\Email;
 use Phalcon\Validation\Validator\PresenceOf;
diff --git a/tests/integration/Validation/AppendMessageCest.php b/tests/integration/Validation/AppendMessageCest.php
index a89383511ff..7042440a709 100644
--- a/tests/integration/Validation/AppendMessageCest.php
+++ b/tests/integration/Validation/AppendMessageCest.php
@@ -20,7 +20,7 @@
 class AppendMessageCest
 {
     /**
-     * Tests Phalcon\Validation :: appendMessage()
+     * Tests Phalcon\Validation\Validation :: appendMessage()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/BindCest.php b/tests/integration/Validation/BindCest.php
index 29128956584..a248b304510 100644
--- a/tests/integration/Validation/BindCest.php
+++ b/tests/integration/Validation/BindCest.php
@@ -13,13 +13,13 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use stdClass;
 
 class BindCest
 {
     /**
-     * Tests Phalcon\Validation :: bind()
+     * Tests Phalcon\Validation\Validation :: bind()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-04-17
diff --git a/tests/integration/Validation/ConstructCest.php b/tests/integration/Validation/ConstructCest.php
index 18930a6b561..d21bef4b9ab 100644
--- a/tests/integration/Validation/ConstructCest.php
+++ b/tests/integration/Validation/ConstructCest.php
@@ -13,14 +13,14 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Date;
 use Phalcon\Validation\Validator\Email;
 
 class ConstructCest
 {
     /**
-     * Tests Phalcon\Validation :: __construct()
+     * Tests Phalcon\Validation\Validation :: __construct()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-05-25
diff --git a/tests/integration/Validation/GetEntityCest.php b/tests/integration/Validation/GetEntityCest.php
index ea94a6feed9..d5297f113c7 100644
--- a/tests/integration/Validation/GetEntityCest.php
+++ b/tests/integration/Validation/GetEntityCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use stdClass;
 
 /**
@@ -22,7 +22,7 @@
 class GetEntityCest
 {
     /**
-     * Tests Phalcon\Validation :: getEntity()
+     * Tests Phalcon\Validation\Validation :: getEntity()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-04-17
diff --git a/tests/integration/Validation/GetFiltersCest.php b/tests/integration/Validation/GetFiltersCest.php
index c5caa9c78cd..e3940d77955 100644
--- a/tests/integration/Validation/GetFiltersCest.php
+++ b/tests/integration/Validation/GetFiltersCest.php
@@ -13,13 +13,13 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\PresenceOf;
 
 class GetFiltersCest
 {
     /**
-     * Tests Phalcon\Validation :: getFilters()
+     * Tests Phalcon\Validation\Validation :: getFilters()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-05-27
diff --git a/tests/integration/Validation/GetValidatorsCest.php b/tests/integration/Validation/GetValidatorsCest.php
index 3f9e43a1a02..adfe1cdf681 100644
--- a/tests/integration/Validation/GetValidatorsCest.php
+++ b/tests/integration/Validation/GetValidatorsCest.php
@@ -20,7 +20,7 @@
 class GetValidatorsCest
 {
     /**
-     * Tests Phalcon\Validation :: getValidators()
+     * Tests Phalcon\Validation\Validation :: getValidators()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/GetValueCest.php b/tests/integration/Validation/GetValueCest.php
index 1c2c8bb2ce6..c0929650fbd 100644
--- a/tests/integration/Validation/GetValueCest.php
+++ b/tests/integration/Validation/GetValueCest.php
@@ -20,7 +20,7 @@
 class GetValueCest
 {
     /**
-     * Tests Phalcon\Validation :: getValue()
+     * Tests Phalcon\Validation\Validation :: getValue()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/RuleCest.php b/tests/integration/Validation/RuleCest.php
index 8dda2fe0296..a4be1c21681 100644
--- a/tests/integration/Validation/RuleCest.php
+++ b/tests/integration/Validation/RuleCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Alpha;
 use Phalcon\Validation\Validator\Email;
 use Phalcon\Validation\Validator\PresenceOf;
@@ -21,7 +21,7 @@
 class RuleCest
 {
     /**
-     * Tests Phalcon\Validation :: rule()
+     * Tests Phalcon\Validation\Validation :: rule()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-05-27
diff --git a/tests/integration/Validation/SetDefaultMessagesCest.php b/tests/integration/Validation/SetDefaultMessagesCest.php
index f09f1e15329..f9c62b2d5b2 100644
--- a/tests/integration/Validation/SetDefaultMessagesCest.php
+++ b/tests/integration/Validation/SetDefaultMessagesCest.php
@@ -20,7 +20,7 @@
 class SetDefaultMessagesCest
 {
     /**
-     * Tests Phalcon\Validation :: setDefaultMessages()
+     * Tests Phalcon\Validation\Validation :: setDefaultMessages()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/SetEntityCest.php b/tests/integration/Validation/SetEntityCest.php
index 2ef92c0aa39..c42abd7daab 100644
--- a/tests/integration/Validation/SetEntityCest.php
+++ b/tests/integration/Validation/SetEntityCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use stdClass;
 
 class SetEntityCest
diff --git a/tests/integration/Validation/SetEventsManagerCest.php b/tests/integration/Validation/SetEventsManagerCest.php
index daa27401ca6..b33587f8980 100644
--- a/tests/integration/Validation/SetEventsManagerCest.php
+++ b/tests/integration/Validation/SetEventsManagerCest.php
@@ -20,7 +20,7 @@
 class SetEventsManagerCest
 {
     /**
-     * Tests Phalcon\Validation :: setEventsManager()
+     * Tests Phalcon\Validation\Validation :: setEventsManager()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/SetFiltersCest.php b/tests/integration/Validation/SetFiltersCest.php
index e7897798a5c..ef79ea095af 100644
--- a/tests/integration/Validation/SetFiltersCest.php
+++ b/tests/integration/Validation/SetFiltersCest.php
@@ -13,13 +13,13 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\PresenceOf;
 
 class SetFiltersCest
 {
     /**
-     * Tests Phalcon\Validation :: setFilters()
+     * Tests Phalcon\Validation\Validation :: setFilters()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-05-27
diff --git a/tests/integration/Validation/SetValidatorsCest.php b/tests/integration/Validation/SetValidatorsCest.php
index c2316ad39f0..3f23a541266 100644
--- a/tests/integration/Validation/SetValidatorsCest.php
+++ b/tests/integration/Validation/SetValidatorsCest.php
@@ -13,14 +13,14 @@
 namespace Phalcon\Test\Integration\Validation;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Date;
 use Phalcon\Validation\Validator\Email;
 
 class SetValidatorsCest
 {
     /**
-     * Tests Phalcon\Validation :: setValidators()
+     * Tests Phalcon\Validation\Validation :: setValidators()
      *
      * @author Sid Roberts <https://github.com/SidRoberts>
      * @since  2019-05-25
diff --git a/tests/integration/Validation/UnderscoreGetCest.php b/tests/integration/Validation/UnderscoreGetCest.php
index 9ddd2d3cfa7..beb83ab8df2 100644
--- a/tests/integration/Validation/UnderscoreGetCest.php
+++ b/tests/integration/Validation/UnderscoreGetCest.php
@@ -20,7 +20,7 @@
 class UnderscoreGetCest
 {
     /**
-     * Tests Phalcon\Validation :: __get()
+     * Tests Phalcon\Validation\Validation :: __get()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/ValidateCest.php b/tests/integration/Validation/ValidateCest.php
index ab84df91983..b03327316ca 100644
--- a/tests/integration/Validation/ValidateCest.php
+++ b/tests/integration/Validation/ValidateCest.php
@@ -20,7 +20,7 @@
 class ValidateCest
 {
     /**
-     * Tests Phalcon\Validation :: validate()
+     * Tests Phalcon\Validation\Validation :: validate()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2019-04-16
diff --git a/tests/integration/Validation/ValidationCest.php b/tests/integration/Validation/ValidationCest.php
index 7a879bf6807..55ac56b009c 100644
--- a/tests/integration/Validation/ValidationCest.php
+++ b/tests/integration/Validation/ValidationCest.php
@@ -7,7 +7,7 @@
 use Phalcon\Messages\Messages;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use Phalcon\Test\Models\Users;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Alpha;
 use Phalcon\Validation\Validator\Email;
 use Phalcon\Validation\Validator\PresenceOf;
@@ -18,7 +18,7 @@
 
 /**
  * Phalcon\Test\Integration\ValidationCest
- * Tests the \Phalcon\Validation component
+ * Tests the \Phalcon\Validation\Validation component
  *
  * @copyright (c) 2011-2017 Phalcon Team
  * @link          http://www.phalconphp.com
diff --git a/tests/integration/Validation/Validator/Alnum/ValidateCest.php b/tests/integration/Validation/Validator/Alnum/ValidateCest.php
index 3b7503796bf..bd7811b840e 100644
--- a/tests/integration/Validation/Validator/Alnum/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Alnum/ValidateCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Alnum;
 
 class ValidateCest
diff --git a/tests/integration/Validation/Validator/Alpha/ValidateCest.php b/tests/integration/Validation/Validator/Alpha/ValidateCest.php
index 2b8df109595..136308bb881 100644
--- a/tests/integration/Validation/Validator/Alpha/ValidateCest.php
+++ b/tests/integration/Validation/Validator/Alpha/ValidateCest.php
@@ -16,7 +16,7 @@
 use IntegrationTester;
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Alpha;
 
 class ValidateCest
diff --git a/tests/integration/Validation/Validator/CreditCard/ValidateCest.php b/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
index 09f88e3ee9c..fddc82894d9 100644
--- a/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
+++ b/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
@@ -15,7 +15,7 @@
 use IntegrationTester;
 use Phalcon\Messages\Message;
 use Phalcon\Messages\Messages;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\CreditCard;
 
 /**
diff --git a/tests/integration/Validation/Validator/UniquenessCest.php b/tests/integration/Validation/Validator/UniquenessCest.php
index c2614885268..a727d78e54a 100644
--- a/tests/integration/Validation/Validator/UniquenessCest.php
+++ b/tests/integration/Validation/Validator/UniquenessCest.php
@@ -17,7 +17,7 @@
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use Phalcon\Test\Models\Robots;
 use Phalcon\Test\Models\Some\Robotters;
-use Phalcon\Validation;
+use Phalcon\Validation\Validation;
 use Phalcon\Validation\Validator\Uniqueness;
 
 class UniquenessCest