diff --git a/tests/_data/fixtures/Traits/BeanstalkTrait.php b/tests/_data/fixtures/Traits/BeanstalkTrait.php
index d355e3c4783..f18ad5e71a9 100644
--- a/tests/_data/fixtures/Traits/BeanstalkTrait.php
+++ b/tests/_data/fixtures/Traits/BeanstalkTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -15,6 +16,11 @@
 use UnitTester;
 use function var_dump;
 
+/**
+ * Trait BeanstalkTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait BeanstalkTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/Cache/FileTrait.php b/tests/_data/fixtures/Traits/Cache/FileTrait.php
index b6e19c5d7ff..f9bede4e2cc 100644
--- a/tests/_data/fixtures/Traits/Cache/FileTrait.php
+++ b/tests/_data/fixtures/Traits/Cache/FileTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -15,6 +16,11 @@
 use Phalcon\Cache\Frontend\Data;
 use function cacheFolder;
 
+/**
+ * Trait FileTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits\Cache
+ */
 trait FileTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/CollectionTrait.php b/tests/_data/fixtures/Traits/CollectionTrait.php
index 338430e3a2a..f6ed5315d81 100644
--- a/tests/_data/fixtures/Traits/CollectionTrait.php
+++ b/tests/_data/fixtures/Traits/CollectionTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/tests/_data/fixtures/Traits/ConfigTrait.php b/tests/_data/fixtures/Traits/ConfigTrait.php
index 97beea60f23..58f880f7d1f 100644
--- a/tests/_data/fixtures/Traits/ConfigTrait.php
+++ b/tests/_data/fixtures/Traits/ConfigTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -19,6 +20,11 @@
 use Phalcon\Config\Adapter\Yaml;
 use UnitTester;
 
+/**
+ * Trait ConfigTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait ConfigTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/CookieTrait.php b/tests/_data/fixtures/Traits/CookieTrait.php
index 3354e92a030..da5db4c616d 100644
--- a/tests/_data/fixtures/Traits/CookieTrait.php
+++ b/tests/_data/fixtures/Traits/CookieTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -13,6 +14,11 @@
 
 use RuntimeException;
 
+/**
+ * Trait CookieTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait CookieTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/CryptTrait.php b/tests/_data/fixtures/Traits/CryptTrait.php
index ee56ccab885..76e7e735f9f 100644
--- a/tests/_data/fixtures/Traits/CryptTrait.php
+++ b/tests/_data/fixtures/Traits/CryptTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -13,6 +14,11 @@
 
 use UnitTester;
 
+/**
+ * Trait CryptTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait CryptTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/Db/MysqlTrait.php b/tests/_data/fixtures/Traits/Db/MysqlTrait.php
index c701049661c..2cb22b99e30 100644
--- a/tests/_data/fixtures/Traits/Db/MysqlTrait.php
+++ b/tests/_data/fixtures/Traits/Db/MysqlTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -15,6 +16,11 @@
 use Phalcon\Db\Index;
 use Phalcon\Db\Reference;
 
+/**
+ * Trait MysqlTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits\Db
+ */
 trait MysqlTrait
 {
     protected $connection = null;
diff --git a/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php b/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php
index c7f863a9d78..8670690a8fb 100644
--- a/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php
+++ b/tests/_data/fixtures/Traits/Db/PostgresqlTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -11,6 +12,11 @@
 
 namespace Phalcon\Test\Fixtures\Traits\Db;
 
+/**
+ * Trait PostgresqlTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits\Db
+ */
 trait PostgresqlTrait
 {
     protected $connection = null;
diff --git a/tests/_data/fixtures/Traits/DiTrait.php b/tests/_data/fixtures/Traits/DiTrait.php
index fe7ae3d9fbd..60cdf2a27cd 100644
--- a/tests/_data/fixtures/Traits/DiTrait.php
+++ b/tests/_data/fixtures/Traits/DiTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -38,6 +39,11 @@
 use Phalcon\Session\Adapter\Files as FilesSession;
 use function dataFolder;
 
+/**
+ * Trait DiTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait DiTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/DialectTrait.php b/tests/_data/fixtures/Traits/DialectTrait.php
index 8d380ceee3d..02d02621ca3 100644
--- a/tests/_data/fixtures/Traits/DialectTrait.php
+++ b/tests/_data/fixtures/Traits/DialectTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -18,6 +19,11 @@
 use Phalcon\Db\Index;
 use Phalcon\Db\Reference;
 
+/**
+ * Trait DialectTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait DialectTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/RedisTrait.php b/tests/_data/fixtures/Traits/RedisTrait.php
index c55b6f9682c..33214d8249a 100644
--- a/tests/_data/fixtures/Traits/RedisTrait.php
+++ b/tests/_data/fixtures/Traits/RedisTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -13,6 +14,11 @@
 
 use UnitTester;
 
+/**
+ * Trait RedisTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait RedisTrait
 {
     protected $options = [];
diff --git a/tests/_data/fixtures/Traits/RouterTrait.php b/tests/_data/fixtures/Traits/RouterTrait.php
index a44a228e409..a33043458cd 100644
--- a/tests/_data/fixtures/Traits/RouterTrait.php
+++ b/tests/_data/fixtures/Traits/RouterTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/tests/_data/fixtures/Traits/TagHelperTrait.php b/tests/_data/fixtures/Traits/TagHelperTrait.php
new file mode 100644
index 00000000000..0e8d89f24f4
--- /dev/null
+++ b/tests/_data/fixtures/Traits/TagHelperTrait.php
@@ -0,0 +1,141 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalconphp.com>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+namespace Phalcon\Test\Fixtures\Traits;
+
+use Phalcon\Html\Tag;
+use UnitTester;
+
+/**
+ * Trait TagSetupTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
+trait TagHelperTrait
+{
+    /**
+     * Tests Phalcon\Tag :: input*()
+     *
+     * @author Phalcon Team <team@phalconphp.com>
+     * @since  2014-09-05
+     */
+    public function tagField(UnitTester $I)
+    {
+        $I->wantToTest(sprintf('Tag - %s() - parameters', $this->function));
+        $tag = new Tag();
+        $tag->setDI($this->container);
+
+        $options  = [
+            'class' => 'x_class',
+        ];
+        $expected = '<input type="' . $this->inputType . '" id="x_name" name="x_name" class="x_class"';
+
+        $this->testFieldParameter($I, $tag, 'x_name', $this->function, $options, $expected);
+        $this->testFieldParameter($I, $tag, 'x_name', $this->function, $options, $expected, true);
+    }
+//
+//    /**
+//     * Tests Phalcon\Tag :: input*() - parameters and id in it
+//     *
+//     * @author Phalcon Team <team@phalconphp.com>
+//     * @since  2014-09-05
+//     */
+//    public function tagFieldParameterWithId(UnitTester $I)
+//    {
+//        $I->wantToTest(sprintf('Tag - %s() - parameters with id', $this->function));
+//        $tag = new Tag();
+//        $tag->setDI($this->container);
+//
+//        $options  = [
+//            'name'  => 'x_name',
+//            'id'    => 'x_id',
+//            'class' => 'x_class',
+//            'size'  => '10',
+//        ];
+//        $expected = '<input type="' . $this->inputType . '" id="x_id" name="x_name" '
+//            . 'class="x_class" size="10"';
+//
+//        $this->testFieldParameter($I, $tag, $this->function, $options, $expected);
+//        $this->testFieldParameter($I, $tag, $this->function, $options, $expected, true);
+//    }
+//
+//    /**
+//     * Tests Phalcon\Tag :: input*() - setDefault
+//     *
+//     * @author Phalcon Team <team@phalconphp.com>
+//     * @since  2014-09-05
+//     */
+//    public function tagFieldWithSetDefault(UnitTester $I)
+//    {
+//        $I->wantToTest(sprintf('Tag - %s() - setDefault()', $this->function));
+//        $tag = new Tag();
+//        $tag->setDI($this->container);
+//
+//        $options  = [
+//            'name'  => 'x_name',
+//            'class' => 'x_class',
+//            'size'  => '10',
+//        ];
+//        $expected = '<input type="' . $this->inputType . '" id="x_name" '
+//            . 'name="x_name" value="x_value" class="x_class" size="10"';
+//
+//        $this->testFieldParameter($I, $tag, $this->function, $options, $expected, false, 'setDefault');
+//        $this->testFieldParameter($I, $tag, $this->function, $options, $expected, true, 'setDefault');
+//    }
+//
+//    /**
+//     * Tests Phalcon\Tag :: input*() - setDefault and element not present
+//     *
+//     * @author Phalcon Team <team@phalconphp.com>
+//     * @since  2014-09-05
+//     */
+//    public function tagFieldWithSetDefaultElementNotPresent(UnitTester $I)
+//    {
+//        $I->wantToTest(sprintf('Tag - %s() - setDefault() element not present', $this->function));
+//        $tag = new Tag();
+//        $tag->setDI($this->container);
+//
+//        $options  = [
+//            'name'  => 'x_name',
+//            'class' => 'x_class',
+//            'size'  => '10',
+//        ];
+//        $expected = '<input type="' . $this->inputType . '" id="x_name" '
+//            . 'name="x_name" value="x_value" class="x_class" '
+//            . 'size="10"';
+//
+//        $this->testFieldParameter($I, $tag, $this->function, $options, $expected, false, 'setDefault');
+//        $this->testFieldParameter($I, $tag, $this->function, $options, $expected, true, 'setDefault');
+//    }
+
+    /**
+     * Runs the test for a Tag::$function with $options
+     *
+     * @param \UnitTester $I
+     * @param string      $name
+     * @param string      $function
+     * @param mixed       $options
+     * @param string      $expected
+     * @param boolean     $xhtml
+     * @param string      $set
+     */
+    abstract protected function testFieldParameter(
+        UnitTester $I,
+        Tag $tag,
+        string $name,
+        string $function,
+        $options,
+        string $expected,
+        bool $xhtml = false,
+        string $set = ''
+    );
+}
diff --git a/tests/_data/fixtures/Traits/TagSetupTrait.php b/tests/_data/fixtures/Traits/TagSetupTrait.php
new file mode 100644
index 00000000000..50115168879
--- /dev/null
+++ b/tests/_data/fixtures/Traits/TagSetupTrait.php
@@ -0,0 +1,86 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalconphp.com>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+namespace Phalcon\Test\Fixtures\Traits;
+
+use Phalcon\Html\Tag;
+use UnitTester;
+
+/**
+ * Trait TagSetupTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
+trait TagSetupTrait
+{
+    /**
+     * Constructor
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalconphp.com>
+     * @since 2018-10-26
+     */
+    public function _before(UnitTester $I)
+    {
+        $this->newDi();
+        $this->setDiEscaper();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    abstract protected function newDi();
+
+    /**
+     * @inheritdoc
+     */
+    abstract protected function setDiEscaper();
+
+    /**
+     * Runs the test for a Tag::$function with $options
+     *
+     * @param UnitTester $I
+     * @param Tag        $tag
+     * @param string     $name
+     * @param string     $function
+     * @param            $options
+     * @param string     $expected
+     * @param bool       $xhtml
+     * @param string     $set
+     */
+    protected function testFieldParameter(
+        UnitTester $I,
+        Tag $tag,
+        string $name,
+        string $function,
+        $options,
+        string $expected,
+        bool $xhtml = false,
+        string $set = ''
+    ) {
+        if ($xhtml) {
+            $tag->setDocType(Tag::XHTML10_STRICT);
+            $expected .= ' />';
+        } else {
+            $tag->setDocType(Tag::HTML5);
+            $expected .= '>';
+        }
+
+        if ($set) {
+            $tag->{$set}('x_name', 'x_value');
+        }
+
+        $actual = $tag->$function($name, $options);
+        $I->assertEquals($expected, $actual);
+    }
+}
diff --git a/tests/_data/fixtures/Traits/TranslateTrait.php b/tests/_data/fixtures/Traits/TranslateTrait.php
index 6cdc34dbd08..9043d1e3cb1 100644
--- a/tests/_data/fixtures/Traits/TranslateTrait.php
+++ b/tests/_data/fixtures/Traits/TranslateTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -14,6 +15,11 @@
 use function dataFolder;
 use UnitTester;
 
+/**
+ * Trait TranslateTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait TranslateTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/ValidationTrait.php b/tests/_data/fixtures/Traits/ValidationTrait.php
index 82fb2626725..f7bb79b2946 100644
--- a/tests/_data/fixtures/Traits/ValidationTrait.php
+++ b/tests/_data/fixtures/Traits/ValidationTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -14,6 +15,11 @@
 use Phalcon\Validation\ValidatorInterface;
 use IntegrationTester;
 
+/**
+ * Trait ValidationTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait ValidationTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/VersionTrait.php b/tests/_data/fixtures/Traits/VersionTrait.php
index e0d90088dbf..80725970d5b 100644
--- a/tests/_data/fixtures/Traits/VersionTrait.php
+++ b/tests/_data/fixtures/Traits/VersionTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -11,6 +12,11 @@
 
 namespace Phalcon\Test\Fixtures\Traits;
 
+/**
+ * Trait VersionTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait VersionTrait
 {
     /**
diff --git a/tests/_data/fixtures/Traits/ViewTrait.php b/tests/_data/fixtures/Traits/ViewTrait.php
index 3b82f86e6b8..7f3fd93ee7f 100644
--- a/tests/_data/fixtures/Traits/ViewTrait.php
+++ b/tests/_data/fixtures/Traits/ViewTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -15,6 +16,11 @@
 use DirectoryIterator;
 use Phalcon\Mvc\ViewBaseInterface;
 
+/**
+ * Trait ViewTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
 trait ViewTrait
 {
     protected $level;