diff --git a/tests/cli/Cli/Dispatcher/GetOptionCest.php b/tests/cli/Cli/Dispatcher/GetOptionCest.php
deleted file mode 100644
index 02796f85db8..00000000000
--- a/tests/cli/Cli/Dispatcher/GetOptionCest.php
+++ /dev/null
@@ -1,51 +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\Cli\Cli\Dispatcher;
-
-use CliTester;
-use Phalcon\Cli\Dispatcher;
-use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
-
-/**
- * Class GetOptionCest
- */
-class GetOptionCest
-{
-    /**
-     * Tests Phalcon\Cli\Dispatcher :: getOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function cliDispatcherGetOption(CliTester $I)
-    {
-        $I->wantToTest('Cli\Dispatcher - getOption()');
-        $di         = new DiFactoryDefault();
-        $dispatcher = new Dispatcher();
-        $dispatcher->setDi($di);
-        $options = [
-            "phalcon" => "value123!",
-        ];
-
-        $dispatcher->setOptions($options);
-        $optionName   = "phalcon";
-        $defaultValue = "Phalcon Rocks!";
-        $I->assertEquals($options[$optionName], $dispatcher->getOption($optionName));
-        $I->assertEquals($options[$optionName], $dispatcher->getOption($optionName, '', $defaultValue));
-        $I->assertEquals($defaultValue, $dispatcher->getOption('nonExisting', '', $defaultValue));
-
-        $I->assertSame('value123', $dispatcher->getOption($optionName, 'alnum'));
-        $I->assertSame(123, $dispatcher->getOption($optionName, ['int']));
-    }
-}
diff --git a/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php b/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php
deleted file mode 100644
index 56925a3c2d9..00000000000
--- a/tests/cli/Cli/Dispatcher/GetSetTaskNameCest.php
+++ /dev/null
@@ -1,37 +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\Cli\Cli\Dispatcher;
-
-use CliTester;
-use Phalcon\Cli\Dispatcher;
-
-class GetSetTaskNameCest
-{
-    /**
-     * Tests Phalcon\Cli\Dispatcher :: getTaskName()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function cliDispatcherGetTaskName(CliTester $I)
-    {
-        $I->wantToTest('Cli\Dispatcher - getTaskName()');
-        $dispatcher = new Dispatcher();
-        $I->assertNull($dispatcher->getTaskName());
-
-        $value = "Phalcon";
-        $dispatcher->setTaskName($value);
-        $I->assertEquals($value, $dispatcher->getTaskName());
-    }
-}
diff --git a/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php b/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php
deleted file mode 100644
index ffa811c3cb5..00000000000
--- a/tests/cli/Cli/Dispatcher/GetSetTaskSuffixCest.php
+++ /dev/null
@@ -1,41 +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\Cli\Cli\Dispatcher;
-
-use CliTester;
-use Phalcon\Cli\Dispatcher;
-
-/**
- * Class GetTaskSuffixCest
- */
-class GetSetTaskSuffixCest
-{
-    /**
-     * Tests Phalcon\Cli\Dispatcher :: getTaskSuffix()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function cliDispatcherGetTaskSuffix(CliTester $I)
-    {
-        $I->wantToTest('Cli\Dispatcher - getTaskSuffix()');
-
-        $dispatcher = new Dispatcher();
-        $I->assertEquals("Task", $dispatcher->getTaskSuffix());
-
-        $value = "Phalcon";
-        $dispatcher->setTaskSuffix($value);
-        $I->assertEquals($value, $dispatcher->getTaskSuffix());
-    }
-}
diff --git a/tests/cli/Cli/Dispatcher/WasForwardedCest.php b/tests/cli/Cli/Dispatcher/WasForwardedCest.php
deleted file mode 100644
index 57da61cf315..00000000000
--- a/tests/cli/Cli/Dispatcher/WasForwardedCest.php
+++ /dev/null
@@ -1,47 +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\Cli\Cli\Dispatcher;
-
-use CliTester;
-use Phalcon\Cli\Dispatcher;
-use Phalcon\Di\FactoryDefault\Cli as DiFactoryDefault;
-
-class WasForwardedCest
-{
-    /**
-     * Tests Phalcon\Cli\Dispatcher :: wasForwarded()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function cliDispatcherWasForwarded(CliTester $I)
-    {
-        $I->wantToTest('Cli\Dispatcher - wasForwarded()');
-
-        $dispatcher = new Dispatcher();
-        $dispatcher->setDefaultNamespace('Phalcon\Test\Fixtures\Tasks');
-        $dispatcher->setDI(
-            new DiFactoryDefault()
-        );
-        $I->assertFalse($dispatcher->wasForwarded());
-        $dispatcher->forward(
-            [
-                'task'   => 'echo',
-                'action' => 'main',
-            ]
-        );
-        $dispatcher->dispatch();
-        $I->assertTrue($dispatcher->wasForwarded());
-    }
-}
diff --git a/tests/unit/Annotations/Reflection/GetReflectionDataCest.php b/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
deleted file mode 100644
index e2d6af24101..00000000000
--- a/tests/unit/Annotations/Reflection/GetReflectionDataCest.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\Annotations\Reflection;
-
-use UnitTester;
-
-class GetReflectionDataCest
-{
-    /**
-     * Tests Phalcon\Annotations\Reflection :: getReflectionData()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function annotationsReflectionGetReflectionData(UnitTester $I)
-    {
-        $I->wantToTest('Annotations\Reflection - getReflectionData()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Assets/Collection/JoinCest.php b/tests/unit/Assets/Collection/JoinCest.php
deleted file mode 100644
index d44e7855c2b..00000000000
--- a/tests/unit/Assets/Collection/JoinCest.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\Assets\Collection;
-
-use UnitTester;
-
-class JoinCest
-{
-    /**
-     * Tests Phalcon\Assets\Collection :: join()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function assetsCollectionJoin(UnitTester $I)
-    {
-        $I->wantToTest('Assets\Collection - join()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Assets/Manager/AddInlineCodeByTypeCest.php b/tests/unit/Assets/Manager/AddInlineCodeByTypeCest.php
deleted file mode 100644
index bad123d9921..00000000000
--- a/tests/unit/Assets/Manager/AddInlineCodeByTypeCest.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\Assets\Manager;
-
-use UnitTester;
-
-class AddInlineCodeByTypeCest
-{
-    /**
-     * Tests Phalcon\Assets\Manager :: addInlineCodeByType()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function assetsManagerAddInlineCodeByType(UnitTester $I)
-    {
-        $I->wantToTest('Assets\Manager - addInlineCodeByType()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Assets/Manager/SetCest.php b/tests/unit/Assets/Manager/SetCest.php
deleted file mode 100644
index 9104a065b2f..00000000000
--- a/tests/unit/Assets/Manager/SetCest.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\Assets\Manager;
-
-use UnitTester;
-
-class SetCest
-{
-    /**
-     * Tests Phalcon\Assets\Manager :: set()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function assetsManagerSet(UnitTester $I)
-    {
-        $I->wantToTest('Assets\Manager - set()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Debug/ListenCest.php b/tests/unit/Debug/ListenCest.php
deleted file mode 100644
index a78773390a3..00000000000
--- a/tests/unit/Debug/ListenCest.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\Debug;
-
-use UnitTester;
-
-class ListenCest
-{
-    /**
-     * Tests Phalcon\Debug :: listen()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function debugListen(UnitTester $I)
-    {
-        $I->wantToTest('Debug - listen()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/unit/Dispatcher/ForwardCest.php b/tests/unit/Dispatcher/ForwardCest.php
deleted file mode 100644
index ddea90d0096..00000000000
--- a/tests/unit/Dispatcher/ForwardCest.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\Dispatcher;
-
-use UnitTester;
-
-class ForwardCest
-{
-    /**
-     * Tests Phalcon\Dispatcher :: forward()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function dispatcherForward(UnitTester $I)
-    {
-        $I->wantToTest('Dispatcher - forward()');
-
-        $I->skipTest('Need implementation');
-    }
-}