diff --git a/tests/integration/Collection/AppendMessageCest.php b/tests/integration/Collection/AppendMessageCest.php
index b183d0e..ef271b0 100644
--- a/tests/integration/Collection/AppendMessageCest.php
+++ b/tests/integration/Collection/AppendMessageCest.php
@@ -14,13 +14,11 @@
 namespace Phalcon\Incubator\MongoDB\Mvc\Test\Integration\Collection;
 
 use IntegrationTester;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Messages\MessageInterface;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class AppendMessageCest
- */
 class AppendMessageCest
 {
     use DiTrait;
@@ -36,6 +34,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: appendMessage()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/AssignCest.php b/tests/integration/Collection/AssignCest.php
index df1d5e1..5bbd233 100644
--- a/tests/integration/Collection/AssignCest.php
+++ b/tests/integration/Collection/AssignCest.php
@@ -18,9 +18,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\SuperRobots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class AssignCest
- */
 class AssignCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/Behavior/ConstructCest.php b/tests/integration/Collection/Behavior/ConstructCest.php
index e7c30cc..dcf3106 100644
--- a/tests/integration/Collection/Behavior/ConstructCest.php
+++ b/tests/integration/Collection/Behavior/ConstructCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class ConstructCest
- */
 class ConstructCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/MissingMethodCest.php b/tests/integration/Collection/Behavior/MissingMethodCest.php
index 9181f01..61326b1 100644
--- a/tests/integration/Collection/Behavior/MissingMethodCest.php
+++ b/tests/integration/Collection/Behavior/MissingMethodCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class MissingMethodCest
- */
 class MissingMethodCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/NotifyCest.php b/tests/integration/Collection/Behavior/NotifyCest.php
index 05c8e20..3a2c99a 100644
--- a/tests/integration/Collection/Behavior/NotifyCest.php
+++ b/tests/integration/Collection/Behavior/NotifyCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class NotifyCest
- */
 class NotifyCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/SoftDelete/ConstructCest.php b/tests/integration/Collection/Behavior/SoftDelete/ConstructCest.php
index 1506e45..18cf219 100644
--- a/tests/integration/Collection/Behavior/SoftDelete/ConstructCest.php
+++ b/tests/integration/Collection/Behavior/SoftDelete/ConstructCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class ConstructCest
- */
 class ConstructCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/SoftDelete/MissingMethodCest.php b/tests/integration/Collection/Behavior/SoftDelete/MissingMethodCest.php
index d226cc2..9b654da 100644
--- a/tests/integration/Collection/Behavior/SoftDelete/MissingMethodCest.php
+++ b/tests/integration/Collection/Behavior/SoftDelete/MissingMethodCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class MissingMethodCest
- */
 class MissingMethodCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/SoftDelete/NotifyCest.php b/tests/integration/Collection/Behavior/SoftDelete/NotifyCest.php
index cc93333..9c33d96 100644
--- a/tests/integration/Collection/Behavior/SoftDelete/NotifyCest.php
+++ b/tests/integration/Collection/Behavior/SoftDelete/NotifyCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class NotifyCest
- */
 class NotifyCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/Timestampable/ConstructCest.php b/tests/integration/Collection/Behavior/Timestampable/ConstructCest.php
index 1645bef..227f216 100644
--- a/tests/integration/Collection/Behavior/Timestampable/ConstructCest.php
+++ b/tests/integration/Collection/Behavior/Timestampable/ConstructCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class ConstructCest
- */
 class ConstructCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/Timestampable/MissingMethodCest.php b/tests/integration/Collection/Behavior/Timestampable/MissingMethodCest.php
index 8b220a9..a3d36e5 100644
--- a/tests/integration/Collection/Behavior/Timestampable/MissingMethodCest.php
+++ b/tests/integration/Collection/Behavior/Timestampable/MissingMethodCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class MissingMethodCest
- */
 class MissingMethodCest
 {
     /**
diff --git a/tests/integration/Collection/Behavior/Timestampable/NotifyCest.php b/tests/integration/Collection/Behavior/Timestampable/NotifyCest.php
index 97d5784..cd5d947 100644
--- a/tests/integration/Collection/Behavior/Timestampable/NotifyCest.php
+++ b/tests/integration/Collection/Behavior/Timestampable/NotifyCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class NotifyCest
- */
 class NotifyCest
 {
     /**
diff --git a/tests/integration/Collection/CloneResultCest.php b/tests/integration/Collection/CloneResultCest.php
index 3f6a6d1..70635c4 100644
--- a/tests/integration/Collection/CloneResultCest.php
+++ b/tests/integration/Collection/CloneResultCest.php
@@ -15,12 +15,10 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class CloneResultCest
- */
 class CloneResultCest
 {
     use DiTrait;
@@ -52,6 +50,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: cloneResult()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/ConstructCest.php b/tests/integration/Collection/ConstructCest.php
index 15bbc04..f87599f 100644
--- a/tests/integration/Collection/ConstructCest.php
+++ b/tests/integration/Collection/ConstructCest.php
@@ -18,9 +18,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class ConstructCest
- */
 class ConstructCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/CountCest.php b/tests/integration/Collection/CountCest.php
index 0c4a9ed..579adef 100644
--- a/tests/integration/Collection/CountCest.php
+++ b/tests/integration/Collection/CountCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class CountCest
- */
 class CountCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -70,6 +66,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: count()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/CreateCest.php b/tests/integration/Collection/CreateCest.php
index fd76d12..5ebb51e 100644
--- a/tests/integration/Collection/CreateCest.php
+++ b/tests/integration/Collection/CreateCest.php
@@ -15,20 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class CreateCest
- */
 class CreateCest
 {
     use DiTrait;
 
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -44,6 +41,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: create()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/DeleteCest.php b/tests/integration/Collection/DeleteCest.php
index eda2fa3..e0eef92 100644
--- a/tests/integration/Collection/DeleteCest.php
+++ b/tests/integration/Collection/DeleteCest.php
@@ -15,12 +15,10 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class DeleteCest
- */
 class DeleteCest
 {
     use DiTrait;
@@ -58,6 +56,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: delete()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/Document/JsonSerializeCest.php b/tests/integration/Collection/Document/JsonSerializeCest.php
index cb9bc83..42754d4 100644
--- a/tests/integration/Collection/Document/JsonSerializeCest.php
+++ b/tests/integration/Collection/Document/JsonSerializeCest.php
@@ -41,7 +41,7 @@ public function mvcCollectionDocumentJsonSerializeCest(IntegrationTester $I)
         $parts = [
             'id' => new ObjectId(),
             'date' => null,
-            'common_name' => 'Henry'
+            'common_name' => 'Henry',
         ];
 
         $robotPart = new RobotPart($parts);
diff --git a/tests/integration/Collection/Document/OffsetArrayAccessCest.php b/tests/integration/Collection/Document/OffsetArrayAccessCest.php
index 09c3885..223d4b9 100644
--- a/tests/integration/Collection/Document/OffsetArrayAccessCest.php
+++ b/tests/integration/Collection/Document/OffsetArrayAccessCest.php
@@ -52,7 +52,7 @@ public function mvcCollectionDocumentOffsetExists(IntegrationTester $I)
 
         $parts = [
             'id' => $robot->getId(),
-            'common_name' => $robot->first_name . ' ' . $robot->last_name
+            'common_name' => $robot->first_name . ' ' . $robot->last_name,
         ];
 
         $robotPart = new RobotPart($parts);
diff --git a/tests/integration/Collection/FindByIdCest.php b/tests/integration/Collection/FindByIdCest.php
index 1da7c56..a1747a5 100644
--- a/tests/integration/Collection/FindByIdCest.php
+++ b/tests/integration/Collection/FindByIdCest.php
@@ -16,24 +16,19 @@
 use IntegrationTester;
 use MongoDB\BSON\ObjectId;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class FindByIdCest
- */
 class FindByIdCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
-    /** @var ObjectId $tmpId */
-    private $tmpId;
+    private ObjectId $tmpId;
 
     public function _before()
     {
@@ -64,6 +59,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: findById()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/FindCest.php b/tests/integration/Collection/FindCest.php
index fd00e7f..8abec34 100644
--- a/tests/integration/Collection/FindCest.php
+++ b/tests/integration/Collection/FindCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class FindCest
- */
 class FindCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -62,6 +58,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: find()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/FindFirstCest.php b/tests/integration/Collection/FindFirstCest.php
index f13e616..25e548e 100644
--- a/tests/integration/Collection/FindFirstCest.php
+++ b/tests/integration/Collection/FindFirstCest.php
@@ -18,9 +18,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class FindFirstCest
- */
 class FindFirstCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/FireEventCancelCest.php b/tests/integration/Collection/FireEventCancelCest.php
index 79c035c..e354fe8 100644
--- a/tests/integration/Collection/FireEventCancelCest.php
+++ b/tests/integration/Collection/FireEventCancelCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class FireEventCancelCest
- */
 class FireEventCancelCest
 {
     /**
@@ -30,5 +27,5 @@ class FireEventCancelCest
     public function mvcCollectionFireEventCancel(IntegrationTester $I)
     {
         $I->wantToTest('Mvc\Collection - fireEventCancel()');
-}
+    }
 }
diff --git a/tests/integration/Collection/FireEventCest.php b/tests/integration/Collection/FireEventCest.php
index 9a5169f..812e01e 100644
--- a/tests/integration/Collection/FireEventCest.php
+++ b/tests/integration/Collection/FireEventCest.php
@@ -15,9 +15,6 @@
 
 use IntegrationTester;
 
-/**
- * Class FireEventCest
- */
 class FireEventCest
 {
     /**
diff --git a/tests/integration/Collection/GetCollectionManagerCest.php b/tests/integration/Collection/GetCollectionManagerCest.php
index c0bdb1b..1459e35 100644
--- a/tests/integration/Collection/GetCollectionManagerCest.php
+++ b/tests/integration/Collection/GetCollectionManagerCest.php
@@ -18,9 +18,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetCollectionManagerCest
- */
 class GetCollectionManagerCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/GetConnectionCest.php b/tests/integration/Collection/GetConnectionCest.php
index ec1ff81..8a50dae 100644
--- a/tests/integration/Collection/GetConnectionCest.php
+++ b/tests/integration/Collection/GetConnectionCest.php
@@ -18,9 +18,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetConnectionCest
- */
 class GetConnectionCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/GetConnectionServiceCest.php b/tests/integration/Collection/GetConnectionServiceCest.php
index c31172d..f3a7a54 100644
--- a/tests/integration/Collection/GetConnectionServiceCest.php
+++ b/tests/integration/Collection/GetConnectionServiceCest.php
@@ -17,9 +17,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetConnectionServiceCest
- */
 class GetConnectionServiceCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/GetDICest.php b/tests/integration/Collection/GetDICest.php
index ffd5fcf..eadd12d 100644
--- a/tests/integration/Collection/GetDICest.php
+++ b/tests/integration/Collection/GetDICest.php
@@ -17,9 +17,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetDICest
- */
 class GetDICest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/GetIdCest.php b/tests/integration/Collection/GetIdCest.php
index 1223d13..cf5934b 100644
--- a/tests/integration/Collection/GetIdCest.php
+++ b/tests/integration/Collection/GetIdCest.php
@@ -16,23 +16,21 @@
 use IntegrationTester;
 use MongoDB\Database;
 use MongoDB\InsertOneResult;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetIdCest
- */
 class GetIdCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
-    /** @var mixed $id */
+    /**
+     * @var mixed
+     */
     private $id;
 
     public function _before()
@@ -59,6 +57,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: getId()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/GetMessagesCest.php b/tests/integration/Collection/GetMessagesCest.php
index 9c910e8..64bc31d 100644
--- a/tests/integration/Collection/GetMessagesCest.php
+++ b/tests/integration/Collection/GetMessagesCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetMessagesCest
- */
 class GetMessagesCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -45,6 +41,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: getMessages()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/GetReservedAttributesCest.php b/tests/integration/Collection/GetReservedAttributesCest.php
index 79a14ab..b4452d7 100644
--- a/tests/integration/Collection/GetReservedAttributesCest.php
+++ b/tests/integration/Collection/GetReservedAttributesCest.php
@@ -18,9 +18,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetReservedAttributesCest
- */
 class GetReservedAttributesCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/GetSetDirtyStateCest.php b/tests/integration/Collection/GetSetDirtyStateCest.php
index 385714c..2109e54 100644
--- a/tests/integration/Collection/GetSetDirtyStateCest.php
+++ b/tests/integration/Collection/GetSetDirtyStateCest.php
@@ -15,21 +15,18 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetSetDirtyStateCest
- */
 class GetSetDirtyStateCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -37,7 +34,7 @@ public function _before()
         $this->setDiCollectionManager();
         $this->setDiMongo();
 
-        $this->source = (new Robots)->getSource();
+        $this->source = (new Robots())->getSource();
         $this->mongo = $this->getDi()->get('mongo');
     }
 
@@ -46,6 +43,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: setDirtyState()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
@@ -54,18 +52,18 @@ public function mvcCollectionGetSetDirtyState(IntegrationTester $I)
         $I->wantToTest('Mvc\Collection - getDirtyState()');
         $I->wantToTest('Mvc\Collection - setDirtyState()');
 
-        $robot = new Robots;
-        $I->assertEquals(Robots::DIRTY_STATE_TRANSIENT, $robot->getDirtyState());
+        $robot = new Robots();
+        $I->assertEquals(Collection::DIRTY_STATE_TRANSIENT, $robot->getDirtyState());
 
         $robot->first_name = "wall";
         $I->assertTrue($robot->save());
-        $I->assertEquals(Robots::DIRTY_STATE_PERSISTENT, $robot->getDirtyState());
+        $I->assertEquals(Collection::DIRTY_STATE_PERSISTENT, $robot->getDirtyState());
 
         $I->assertTrue($robot->delete());
-        $I->assertEquals(Robots::DIRTY_STATE_DETACHED, $robot->getDirtyState());
+        $I->assertEquals(Collection::DIRTY_STATE_DETACHED, $robot->getDirtyState());
 
-        $robot->setDirtyState(Robots::DIRTY_STATE_TRANSIENT);
-        $I->assertEquals(Robots::DIRTY_STATE_TRANSIENT, $robot->getDirtyState());
+        $robot->setDirtyState(Collection::DIRTY_STATE_TRANSIENT);
+        $I->assertEquals(Collection::DIRTY_STATE_TRANSIENT, $robot->getDirtyState());
     }
 
     public function _after()
diff --git a/tests/integration/Collection/GetSourceCest.php b/tests/integration/Collection/GetSourceCest.php
index b748e11..ade0697 100644
--- a/tests/integration/Collection/GetSourceCest.php
+++ b/tests/integration/Collection/GetSourceCest.php
@@ -17,9 +17,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class GetSourceCest
- */
 class GetSourceCest
 {
     use DiTrait;
diff --git a/tests/integration/Collection/JsonSerializeCest.php b/tests/integration/Collection/JsonSerializeCest.php
index 8328219..8dd8155 100644
--- a/tests/integration/Collection/JsonSerializeCest.php
+++ b/tests/integration/Collection/JsonSerializeCest.php
@@ -18,26 +18,20 @@
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Documents\RobotPart;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
-use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots2;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class JsonSerializeCest
- */
 class JsonSerializeCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
-    /** @var array $data */
-    private $data;
+    private array $data;
 
     public function _before()
     {
@@ -58,15 +52,15 @@ public function _before()
             'last_name' => 'Nobody',
             'sub' => [
                 'bool' => false,
-                'float' => 0.02
+                'float' => 0.02,
             ],
             'sub2' => [
                 'id' => new ObjectId(),
-                'date' => new UTCDateTime(1595061104 * 1000)
+                'date' => new UTCDateTime(1595061104 * 1000),
             ],
             'rbpart' => $rbpart,
             'version' => 1,
-            'protected_field' => 10
+            'protected_field' => 10,
         ];
 
         $insertOneResult = $this->mongo->selectCollection($this->source)->insertOne($this->data);
@@ -77,6 +71,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: toArray()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/ReadAttributeCest.php b/tests/integration/Collection/ReadAttributeCest.php
index e09b291..42dc25d 100644
--- a/tests/integration/Collection/ReadAttributeCest.php
+++ b/tests/integration/Collection/ReadAttributeCest.php
@@ -15,24 +15,19 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class ReadAttributeCest
- */
 class ReadAttributeCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
-    /** @var string $first_name */
-    private $first_name = 'Unknown';
+    private string $first_name = 'Unknown';
 
     public function _before()
     {
@@ -55,6 +50,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: readAttribute()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/SaveCest.php b/tests/integration/Collection/SaveCest.php
index 8b8aaa4..0b35631 100644
--- a/tests/integration/Collection/SaveCest.php
+++ b/tests/integration/Collection/SaveCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class SaveCest
- */
 class SaveCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -37,7 +33,7 @@ public function _before()
         $this->setDiCollectionManager();
         $this->setDiMongo();
 
-        $this->source = (new Robots)->getSource();
+        $this->source = (new Robots())->getSource();
         $this->mongo = $this->getDi()->get('mongo');
 
         $this->mongo->selectCollection($this->source)->insertOne(
@@ -52,6 +48,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: save()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/SerializeUnserializeCest.php b/tests/integration/Collection/SerializeUnserializeCest.php
index 7f7637a..6184245 100644
--- a/tests/integration/Collection/SerializeUnserializeCest.php
+++ b/tests/integration/Collection/SerializeUnserializeCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class SerializeUnserializeCest
- */
 class SerializeUnserializeCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -37,7 +33,7 @@ public function _before()
         $this->setDiCollectionManager();
         $this->setDiMongo();
 
-        $this->source = (new Robots)->getSource();
+        $this->source = (new Robots())->getSource();
         $this->mongo = $this->getDi()->get('mongo');
 
         $this->mongo->selectCollection($this->source)->insertOne(
@@ -53,6 +49,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: unserialize()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/SetConnectionServiceCest.php b/tests/integration/Collection/SetConnectionServiceCest.php
index f0a1754..3cad3ee 100644
--- a/tests/integration/Collection/SetConnectionServiceCest.php
+++ b/tests/integration/Collection/SetConnectionServiceCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class SetConnectionServiceCest
- */
 class SetConnectionServiceCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -37,7 +33,7 @@ public function _before()
         $this->setDiCollectionManager();
         $this->setDiMongo();
 
-        $this->source = (new Robots)->getSource();
+        $this->source = (new Robots())->getSource();
         $this->mongo = $this->getDi()->get('mongo');
         $this->getDi()->setShared('otherMongo', $this->mongo);
     }
@@ -46,6 +42,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: setConnectionService()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/SetDICest.php b/tests/integration/Collection/SetDICest.php
index 7615e4b..20d5054 100644
--- a/tests/integration/Collection/SetDICest.php
+++ b/tests/integration/Collection/SetDICest.php
@@ -20,9 +20,6 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 use stdClass;
 
-/**
- * Class SetDICest
- */
 class SetDICest
 {
     use DiTrait;
@@ -51,7 +48,7 @@ public function mvcCollectionSetDI(IntegrationTester $I)
 
         $di = new Di();
         $di->set('std', new stdClass);
-        $robot = new Robots;
+        $robot = new Robots();
         $robot->setDI($di);
 
         $I->assertInstanceOf(stdClass::class, $robot->getDI()->get('std'));
diff --git a/tests/integration/Collection/SkipOperationCest.php b/tests/integration/Collection/SkipOperationCest.php
index 4d4cfd6..7f66cbb 100644
--- a/tests/integration/Collection/SkipOperationCest.php
+++ b/tests/integration/Collection/SkipOperationCest.php
@@ -18,18 +18,13 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class SkipOperationCest
- */
 class SkipOperationCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
diff --git a/tests/integration/Collection/ToArrayCest.php b/tests/integration/Collection/ToArrayCest.php
index c4dc0d6..ed36623 100644
--- a/tests/integration/Collection/ToArrayCest.php
+++ b/tests/integration/Collection/ToArrayCest.php
@@ -15,24 +15,19 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class ToArrayCest
- */
 class ToArrayCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
-    /** @var array $data */
-    private $data;
+    private array $data;
 
     public function _before()
     {
@@ -48,11 +43,11 @@ public function _before()
             'last_name' => 'Nobody',
             'sub' => [
                 'bool' => false,
-                'float' => 0.02
+                'float' => 0.02,
             ],
             'version' => 1,
             'rbpart' => null,
-            'protected_field' => 10
+            'protected_field' => 10,
         ];
 
         $insertOneResult = $this->mongo->selectCollection($this->source)->insertOne($this->data);
@@ -63,6 +58,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: toArray()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/UpdateCest.php b/tests/integration/Collection/UpdateCest.php
index 285c647..97a80ab 100644
--- a/tests/integration/Collection/UpdateCest.php
+++ b/tests/integration/Collection/UpdateCest.php
@@ -15,21 +15,17 @@
 
 use IntegrationTester;
 use MongoDB\Database;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Exception;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-/**
- * Class UpdateCest
- */
 class UpdateCest
 {
     use DiTrait;
 
-    /** @var string $source */
-    private $source;
+    private string $source;
 
-    /** @var Database $mongo */
-    private $mongo;
+    private Database $mongo;
 
     public function _before()
     {
@@ -52,6 +48,7 @@ public function _before()
      * Tests Phalcon\Mvc\Collection :: update()
      *
      * @param IntegrationTester $I
+     * @throws Exception
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
diff --git a/tests/integration/Collection/WriteAttributeCest.php b/tests/integration/Collection/WriteAttributeCest.php
index b6b423e..4394898 100644
--- a/tests/integration/Collection/WriteAttributeCest.php
+++ b/tests/integration/Collection/WriteAttributeCest.php
@@ -39,10 +39,10 @@ public function mvcCollectionWriteAttribute(IntegrationTester $I)
     {
         $I->wantToTest('Mvc\Collection - writeAttribute()');
 
-        $robot = new Robots;
-        $first_name = 'Hola';
-        $robot->writeAttribute('first_name', $first_name);
+        $firstName = 'Hola';
+        $robot = new Robots();
+        $robot->writeAttribute('first_name', $firstName);
 
-        $I->assertEquals($first_name, $robot->first_name);
+        $I->assertEquals($firstName, $robot->first_name);
     }
 }
diff --git a/tests/integration/_bootstrap.php b/tests/integration/_bootstrap.php
deleted file mode 100644
index b3d9bbc..0000000
--- a/tests/integration/_bootstrap.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php