diff --git a/phalcon/Factory/AbstractFactory.zep b/phalcon/Factory/AbstractFactory.zep
index 8745d24ed02..9e57cbca847 100644
--- a/phalcon/Factory/AbstractFactory.zep
+++ b/phalcon/Factory/AbstractFactory.zep
@@ -44,7 +44,7 @@ abstract class AbstractFactory extends AbstractConfigFactory
     }
 
     /**
-     * AdapterFactory constructor.
+     * Initialize services/add new services
      */
     protected function init(array! services = []) -> void
     {
diff --git a/phalcon/Forms/Element/AbstractElement.zep b/phalcon/Forms/Element/AbstractElement.zep
index 8fba9b11c17..698569486a2 100644
--- a/phalcon/Forms/Element/AbstractElement.zep
+++ b/phalcon/Forms/Element/AbstractElement.zep
@@ -11,12 +11,12 @@
 namespace Phalcon\Forms\Element;
 
 use InvalidArgumentException;
+use Phalcon\Filter\Validation\ValidatorInterface;
 use Phalcon\Forms\Form;
 use Phalcon\Forms\Exception;
+use Phalcon\Html\TagFactory;
 use Phalcon\Messages\MessageInterface;
 use Phalcon\Messages\Messages;
-use Phalcon\Tag;
-use Phalcon\Filter\Validation\ValidatorInterface;
 
 /**
  * This is a base class for form elements
@@ -43,6 +43,11 @@ abstract class AbstractElement implements ElementInterface
      */
     protected label = null;
 
+    /**
+     * @var string
+     */
+    protected method = "inputText";
+
     /**
      * @var Messages
      */
@@ -58,6 +63,11 @@ abstract class AbstractElement implements ElementInterface
      */
     protected options = [];
 
+    /**
+     * @var TagFactory|null
+     */
+    protected tagFactory = null;
+
     /**
      * @var array
      */
@@ -84,9 +94,9 @@ abstract class AbstractElement implements ElementInterface
             );
         }
 
-        let this->name = name;
-        let this->attributes = attributes;
-        let this->messages = new Messages();
+        let this->name       = name,
+            this->attributes = attributes,
+            this->messages   = new Messages();
     }
 
     /**
@@ -133,18 +143,19 @@ abstract class AbstractElement implements ElementInterface
      * Adds a group of validators
      *
      * @param \Phalcon\Filter\Validation\ValidatorInterface[] validators
-     * @param bool                                     merge
+     * @param bool                                            merge
      */
     public function addValidators(array! validators, bool merge = true) -> <ElementInterface>
     {
-        if merge {
-            let validators = array_merge(
-                this->validators,
-                validators
-            );
+        var validator;
+
+        if unlikely !merge {
+            let this->validators = [];
         }
 
-        let this->validators = validators;
+        for validator in validators {
+            this->addValidator(validator);
+        }
 
         return this;
     }
@@ -165,13 +176,10 @@ abstract class AbstractElement implements ElementInterface
     public function clear() -> <ElementInterface>
     {
         var form  = this->form,
-            name  = this->name,
-            value = this->value;
+            name  = this->name;
 
         if typeof form == "object" {
             form->clear(name);
-        } else {
-            Tag::setDefault(name, value);
         }
 
         return this;
@@ -303,15 +311,7 @@ abstract class AbstractElement implements ElementInterface
         }
 
         /**
-         * Otherwise check Phalcon\Tag
-         */
-        if Tag::hasValue(name) {
-            let value = Tag::getValue(name);
-        }
-
-        /**
-         * Assign the default value if there is no form available or
-         * Phalcon\Tag returns null
+         * Assign the default value if there is no form available
          */
         if value === null {
             let value = this->value;
@@ -333,12 +333,13 @@ abstract class AbstractElement implements ElementInterface
      */
     public function label(array attributes = []) -> string
     {
-        var internalAttributes, label, name, code;
+        var code, internalAttributes, labelName, name, tagFactory;
 
         /**
          * Check if there is an "id" attribute defined
          */
-        let internalAttributes = this->getAttributes();
+        let tagFactory         = this->getTagFactory(),
+            internalAttributes = this->attributes;
 
         if !fetch name, internalAttributes["id"] {
             let name = this->name;
@@ -348,25 +349,23 @@ abstract class AbstractElement implements ElementInterface
             let attributes["for"] = name;
         }
 
-        let code = Tag::renderAttributes("<label", attributes);
-
         /**
          * Use the default label or leave the same name as label
          */
-        let label = this->label;
+        let labelName = this->label;
 
-        if label || is_numeric(label) {
-            let code .= ">" . label . "</label>";
-        } else {
-            let code .= ">" . name . "</label>";
+        if !(labelName || is_numeric(labelName)) {
+            let labelName = name;
         }
 
+        let code = tagFactory->{"label"}(labelName, attributes);
+
         return code;
     }
 
     /**
-     * Returns an array of prepared attributes for Phalcon\Tag helpers
-     * according to the element parameters
+     * Returns an array of prepared attributes for Phalcon\Html\TagFactory
+     * helpers according to the element parameters
      */
     public function prepareAttributes(array attributes = [], bool useChecked = false) -> array
     {
@@ -379,12 +378,8 @@ abstract class AbstractElement implements ElementInterface
         /**
          * Merge passed parameters with default ones
          */
-        let defaultAttributes = this->attributes;
-
-        let mergedAttributes = array_merge(
-            defaultAttributes,
-            attributes
-        );
+        let defaultAttributes = this->attributes,
+            mergedAttributes = array_merge(defaultAttributes, attributes);
 
         /**
          * Get the current element value
@@ -423,6 +418,29 @@ abstract class AbstractElement implements ElementInterface
         return mergedAttributes;
     }
 
+    /**
+     * Renders the element widget returning HTML
+     */
+    public function render(array attributes = []) -> string
+    {
+        var helper, mergedAttributes, method, name, tagFactory, value;
+
+        let name       = this->name,
+            value      = null,
+            method     = this->method,
+            tagFactory = this->getTagFactory(),
+            helper     = tagFactory->newInstance(method);
+
+        if isset attributes["value"] {
+            let value = attributes["value"];
+            unset attributes["value"];
+        }
+
+        let mergedAttributes = array_merge(this->attributes, attributes);
+
+        return helper->__invoke(name, value, mergedAttributes);
+    }
+
     /**
      * Sets a default attribute for the element
      */
@@ -462,7 +480,7 @@ abstract class AbstractElement implements ElementInterface
     public function setFilters(var filters) -> <ElementInterface>
     {
         if unlikely (typeof filters != "string" && typeof filters != "array") {
-            throw new Exception("Wrong filter type added");
+            throw new Exception("The filter needs to be an array or string");
         }
 
         let this->filters = filters;
@@ -510,6 +528,16 @@ abstract class AbstractElement implements ElementInterface
         return this;
     }
 
+    /**
+     * Sets the TagFactory
+     */
+    public function setTagFactory(<TagFactory> tagFactory) -> <AbstractElement>
+    {
+        let this->tagFactory = tagFactory;
+
+        return this;
+    }
+
     /**
      * Sets an option for the element
      */
@@ -529,4 +557,18 @@ abstract class AbstractElement implements ElementInterface
 
         return this;
     }
+
+    /**
+     * Returns the tagFactory; throws exception if not present
+     */
+    protected function getTagFactory() -> <TagFactory>
+    {
+        if unlikely empty this->tagFactory {
+            throw new Exception(
+                "The TagFactory must be set for this element to render"
+            );
+        }
+
+        return this->tagFactory;
+    }
 }
diff --git a/phalcon/Forms/Element/Check.zep b/phalcon/Forms/Element/Check.zep
index bc5d56cabda..13736a0be79 100644
--- a/phalcon/Forms/Element/Check.zep
+++ b/phalcon/Forms/Element/Check.zep
@@ -10,22 +10,22 @@
 
 namespace Phalcon\Forms\Element;
 
-use Phalcon\Tag;
-
 /**
- * Phalcon\Forms\Element\Check
- *
  * Component INPUT[type=check] for forms
  */
 class Check extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::checkField(
-            this->prepareAttributes(attributes, true)
-        );
-    }
+    protected method = "inputCheckbox";
+//    /**
+//     * Renders the element widget returning HTML
+//     */
+//    public function render(array attributes = []) -> string
+//    {
+//        return Tag::checkField(
+//            this->prepareAttributes(attributes, true)
+//        );
+//    }
 }
diff --git a/phalcon/Forms/Element/Date.zep b/phalcon/Forms/Element/Date.zep
index 354f8f291f7..366225972bc 100644
--- a/phalcon/Forms/Element/Date.zep
+++ b/phalcon/Forms/Element/Date.zep
@@ -18,12 +18,7 @@ use Phalcon\Tag;
 class Date extends AbstractElement
 {
     /**
-     * Renders the element widget returning html
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::dateField(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputDate";
 }
diff --git a/phalcon/Forms/Element/Email.zep b/phalcon/Forms/Element/Email.zep
index 4fe76d7af92..670eb832606 100644
--- a/phalcon/Forms/Element/Email.zep
+++ b/phalcon/Forms/Element/Email.zep
@@ -20,12 +20,7 @@ use Phalcon\Tag;
 class Email extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::emailField(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputEmail";
 }
diff --git a/phalcon/Forms/Element/File.zep b/phalcon/Forms/Element/File.zep
index dc4111ee537..9145564458e 100644
--- a/phalcon/Forms/Element/File.zep
+++ b/phalcon/Forms/Element/File.zep
@@ -18,12 +18,7 @@ use Phalcon\Tag;
 class File extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::fileField(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputFile";
 }
diff --git a/phalcon/Forms/Element/Hidden.zep b/phalcon/Forms/Element/Hidden.zep
index 0d6f6270cd6..2418cfafdde 100644
--- a/phalcon/Forms/Element/Hidden.zep
+++ b/phalcon/Forms/Element/Hidden.zep
@@ -20,12 +20,7 @@ use Phalcon\Tag;
 class Hidden extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::hiddenField(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputHidden";
 }
diff --git a/phalcon/Forms/Element/Numeric.zep b/phalcon/Forms/Element/Numeric.zep
index d8032d434d4..8998f57977a 100644
--- a/phalcon/Forms/Element/Numeric.zep
+++ b/phalcon/Forms/Element/Numeric.zep
@@ -20,12 +20,7 @@ use Phalcon\Tag;
 class Numeric extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::numericField(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputNumeric";
 }
diff --git a/phalcon/Forms/Element/Password.zep b/phalcon/Forms/Element/Password.zep
index 45b85ba3e08..a693fe838bb 100644
--- a/phalcon/Forms/Element/Password.zep
+++ b/phalcon/Forms/Element/Password.zep
@@ -20,12 +20,7 @@ use Phalcon\Tag;
 class Password extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::passwordField(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputPassword";
 }
diff --git a/phalcon/Forms/Element/Radio.zep b/phalcon/Forms/Element/Radio.zep
index 66ed67cb3b8..03199d385da 100644
--- a/phalcon/Forms/Element/Radio.zep
+++ b/phalcon/Forms/Element/Radio.zep
@@ -20,12 +20,7 @@ use Phalcon\Tag;
 class Radio extends AbstractElement
 {
     /**
-     * Renders the element widget returning HTML
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::radioField(
-            this->prepareAttributes(attributes, true)
-        );
-    }
+    protected method = "inputRadio";
 }
diff --git a/phalcon/Forms/Element/Submit.zep b/phalcon/Forms/Element/Submit.zep
index f732a01185d..1e98478249a 100644
--- a/phalcon/Forms/Element/Submit.zep
+++ b/phalcon/Forms/Element/Submit.zep
@@ -18,15 +18,7 @@ use Phalcon\Tag;
 class Submit extends AbstractElement
 {
     /**
-     * Renders the element widget
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        /**
-         * Merged passed attributes with previously defined ones
-         */
-        return Tag::submitButton(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputSubmit";
 }
diff --git a/phalcon/Forms/Element/Text.zep b/phalcon/Forms/Element/Text.zep
index c8da7ac55bb..86ee352d3b9 100644
--- a/phalcon/Forms/Element/Text.zep
+++ b/phalcon/Forms/Element/Text.zep
@@ -10,7 +10,7 @@
 
 namespace Phalcon\Forms\Element;
 
-use Phalcon\Tag;
+use Phalcon\Forms\Exception;
 
 /**
  * Phalcon\Forms\Element\Text
@@ -19,13 +19,4 @@ use Phalcon\Tag;
  */
 class Text extends AbstractElement
 {
-    /**
-     * Renders the element widget
-     */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::textField(
-            this->prepareAttributes(attributes)
-        );
-    }
 }
diff --git a/phalcon/Forms/Element/TextArea.zep b/phalcon/Forms/Element/TextArea.zep
index 6e83245350b..08dce19de07 100644
--- a/phalcon/Forms/Element/TextArea.zep
+++ b/phalcon/Forms/Element/TextArea.zep
@@ -18,12 +18,7 @@ use Phalcon\Tag;
 class TextArea extends AbstractElement
 {
     /**
-     * Renders the element widget
+     * @var string
      */
-    public function render(array attributes = []) -> string
-    {
-        return Tag::textArea(
-            this->prepareAttributes(attributes)
-        );
-    }
+    protected method = "inputTextarea";
 }
diff --git a/phalcon/Forms/Form.zep b/phalcon/Forms/Form.zep
index df8036de09a..5636754a337 100644
--- a/phalcon/Forms/Form.zep
+++ b/phalcon/Forms/Form.zep
@@ -73,6 +73,11 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac
      */
     protected options = [];
 
+    /**
+     * @var TagFactory|null
+     */
+    protected tagFactory = null;
+
     /**
      * @var ValidationInterface|null
      */
@@ -129,6 +134,9 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac
          * Link the element to the form
          */
         element->setForm(this);
+        if method_exists(element, "setTagFactory") {
+            element->{"setTagFactory"}(this->tagFactory);
+        }
 
         if position == null || empty this->elements {
             /**
@@ -545,6 +553,7 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac
             "label":         true,
             "value":         true,
             "di":            true,
+            "tagFactory":    true,
             "eventsmanager": true
         ];
 
@@ -564,13 +573,13 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac
             return this->{method}();
         }
 
-        /**
-         * Check if the tag has a default value
-         */
-        if Tag::hasValue(name) {
-            return Tag::getValue(name);
-        }
-
+//        /**
+//         * Check if the tag has a default value
+//         */
+//        if Tag::hasValue(name) {
+//            return Tag::getValue(name);
+//        }
+//
         /**
          * Check if element has default value
          */
diff --git a/phalcon/Html/Escaper.zep b/phalcon/Html/Escaper.zep
index 41c19cccc62..402737b21c4 100644
--- a/phalcon/Html/Escaper.zep
+++ b/phalcon/Html/Escaper.zep
@@ -42,9 +42,11 @@ class Escaper implements EscaperInterface
     protected encoding = "utf-8" { get };
 
     /**
+     * ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401
+     *
      * @var int
      */
-    protected flags = 3 { get };
+    protected flags = 11 { get };
 
     /**
      * Escapes a HTML attribute string
diff --git a/phalcon/Html/Helper/Label.zep b/phalcon/Html/Helper/Label.zep
index 1ebb34f0dc2..c51314a9206 100644
--- a/phalcon/Html/Helper/Label.zep
+++ b/phalcon/Html/Helper/Label.zep
@@ -20,13 +20,18 @@ class Label extends AbstractHelper
     /**
      * Produce a `<label>` tag.
      *
-     * @param array $attributes
+     * @param string $label
+     * @param array  $attributes
+     * @param bool   $raw
      *
      * @return string
      * @throws Exception
      */
-    public function __invoke(array attributes = []) -> string
-    {
-        return this->renderElement("label", attributes);
+    public function __invoke(
+        string label,
+        array attributes = [],
+        bool raw = false
+    ) -> string {
+        return this->renderFullElement("label", label, attributes, raw);
     }
 }
diff --git a/phalcon/Html/TagFactory.zep b/phalcon/Html/TagFactory.zep
index 279f3dba610..54b9b125803 100644
--- a/phalcon/Html/TagFactory.zep
+++ b/phalcon/Html/TagFactory.zep
@@ -97,21 +97,17 @@ class TagFactory extends AbstractFactory
      * Magic call to make the helper objects available as methods.
      *
      * @param string $name
-     * @param array  $args
+     * @param array  $arguments
      *
      * @return false|mixed
      */
-    public function __call(string name, array args)
+    public function __call(string name, array arguments)
     {
-        var services;
+        var helper;
 
-        let services = this->getServices();
+        let helper = this->newInstance(name);
 
-        if (true !== isset(services[name])) {
-            throw new Exception("Service " . name . " is not registered");
-        }
-
-        return call_user_func_array(this->newInstance(name), args);
+        return call_user_func_array([helper, "__invoke"], arguments);
     }
 
     /**
diff --git a/tests/integration/Forms/Element/Check/AddFilterCest.php b/tests/integration/Forms/Element/Check/AddFilterCest.php
deleted file mode 100644
index 1364e7b4713..00000000000
--- a/tests/integration/Forms/Element/Check/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/AddValidatorCest.php b/tests/integration/Forms/Element/Check/AddValidatorCest.php
deleted file mode 100644
index 5accfc28e80..00000000000
--- a/tests/integration/Forms/Element/Check/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/AddValidatorsCest.php b/tests/integration/Forms/Element/Check/AddValidatorsCest.php
deleted file mode 100644
index 18560689530..00000000000
--- a/tests/integration/Forms/Element/Check/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/AppendMessageCest.php b/tests/integration/Forms/Element/Check/AppendMessageCest.php
deleted file mode 100644
index 96f2817d680..00000000000
--- a/tests/integration/Forms/Element/Check/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/ClearCest.php b/tests/integration/Forms/Element/Check/ClearCest.php
deleted file mode 100644
index be6bd4028f0..00000000000
--- a/tests/integration/Forms/Element/Check/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/ConstructCest.php b/tests/integration/Forms/Element/Check/ConstructCest.php
deleted file mode 100644
index 14904d9f79c..00000000000
--- a/tests/integration/Forms/Element/Check/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetAttributeCest.php b/tests/integration/Forms/Element/Check/GetAttributeCest.php
deleted file mode 100644
index eab28adfcda..00000000000
--- a/tests/integration/Forms/Element/Check/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetAttributesCest.php b/tests/integration/Forms/Element/Check/GetAttributesCest.php
deleted file mode 100644
index fc5416b6c6a..00000000000
--- a/tests/integration/Forms/Element/Check/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetDefaultCest.php b/tests/integration/Forms/Element/Check/GetDefaultCest.php
deleted file mode 100644
index 9fc4fca1765..00000000000
--- a/tests/integration/Forms/Element/Check/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetFiltersCest.php b/tests/integration/Forms/Element/Check/GetFiltersCest.php
deleted file mode 100644
index cee17c72cd7..00000000000
--- a/tests/integration/Forms/Element/Check/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetLabelCest.php b/tests/integration/Forms/Element/Check/GetLabelCest.php
deleted file mode 100644
index cb7bbc0e3bc..00000000000
--- a/tests/integration/Forms/Element/Check/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetMessagesCest.php b/tests/integration/Forms/Element/Check/GetMessagesCest.php
deleted file mode 100644
index a808c3dc80a..00000000000
--- a/tests/integration/Forms/Element/Check/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetSetFormCest.php b/tests/integration/Forms/Element/Check/GetSetFormCest.php
deleted file mode 100644
index b6457d374de..00000000000
--- a/tests/integration/Forms/Element/Check/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Check;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementCheckGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getForm() / setForm()');
-
-        $address = new Check('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementCheckGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getForm() / setForm()');
-
-        $address = new Check('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetSetNameCest.php b/tests/integration/Forms/Element/Check/GetSetNameCest.php
deleted file mode 100644
index 553efe5ce4c..00000000000
--- a/tests/integration/Forms/Element/Check/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Check;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementCheckGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getName() / setName()');
-
-        $element = new Check('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetUserOptionCest.php b/tests/integration/Forms/Element/Check/GetUserOptionCest.php
deleted file mode 100644
index 91ba7e19aac..00000000000
--- a/tests/integration/Forms/Element/Check/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetUserOptionsCest.php b/tests/integration/Forms/Element/Check/GetUserOptionsCest.php
deleted file mode 100644
index b0bbf14d72a..00000000000
--- a/tests/integration/Forms/Element/Check/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetValidatorsCest.php b/tests/integration/Forms/Element/Check/GetValidatorsCest.php
deleted file mode 100644
index ec4e3eb894d..00000000000
--- a/tests/integration/Forms/Element/Check/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/GetValueCest.php b/tests/integration/Forms/Element/Check/GetValueCest.php
deleted file mode 100644
index 3d2a75714a6..00000000000
--- a/tests/integration/Forms/Element/Check/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/HasMessagesCest.php b/tests/integration/Forms/Element/Check/HasMessagesCest.php
deleted file mode 100644
index e56769e0863..00000000000
--- a/tests/integration/Forms/Element/Check/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/LabelCest.php b/tests/integration/Forms/Element/Check/LabelCest.php
deleted file mode 100644
index d947f7a7569..00000000000
--- a/tests/integration/Forms/Element/Check/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/RenderCest.php b/tests/integration/Forms/Element/Check/RenderCest.php
deleted file mode 100644
index 780eefa0663..00000000000
--- a/tests/integration/Forms/Element/Check/RenderCest.php
+++ /dev/null
@@ -1,83 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Check;
-use Phalcon\Tag;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class RenderCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * executed after each test
-     */
-    public function _after(IntegrationTester $I)
-    {
-        // Setting the doctype to XHTML5 for other tests to run smoothly
-        Tag::setDocType(
-            Tag::XHTML5
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Check :: render()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-05-23
-     */
-    public function formsElementCheckRenderSimple(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - render()');
-
-        $element = new Check('simple');
-
-        $I->assertEquals(
-            '<input type="checkbox" id="simple" name="simple" />',
-            $element->render()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Check :: render() with parameters
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-05-23
-     */
-    public function formsElementCheckRenderWithParameters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - render() with parameters');
-
-        $element = new Check(
-            'fantastic',
-            [
-                'class' => 'fancy',
-            ]
-        );
-
-        $I->assertEquals(
-            '<input type="checkbox" id="fantastic" name="fantastic" class="fancy" />',
-            $element->render()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetAttributeCest.php b/tests/integration/Forms/Element/Check/SetAttributeCest.php
deleted file mode 100644
index a0fe7bbc6da..00000000000
--- a/tests/integration/Forms/Element/Check/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetAttributesCest.php b/tests/integration/Forms/Element/Check/SetAttributesCest.php
deleted file mode 100644
index f37f6d32f23..00000000000
--- a/tests/integration/Forms/Element/Check/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetDefaultCest.php b/tests/integration/Forms/Element/Check/SetDefaultCest.php
deleted file mode 100644
index b6ac73adaee..00000000000
--- a/tests/integration/Forms/Element/Check/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetFiltersCest.php b/tests/integration/Forms/Element/Check/SetFiltersCest.php
deleted file mode 100644
index 7240fe62059..00000000000
--- a/tests/integration/Forms/Element/Check/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetLabelCest.php b/tests/integration/Forms/Element/Check/SetLabelCest.php
deleted file mode 100644
index 19faf4721c1..00000000000
--- a/tests/integration/Forms/Element/Check/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetMessagesCest.php b/tests/integration/Forms/Element/Check/SetMessagesCest.php
deleted file mode 100644
index 2f60f806012..00000000000
--- a/tests/integration/Forms/Element/Check/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetUserOptionCest.php b/tests/integration/Forms/Element/Check/SetUserOptionCest.php
deleted file mode 100644
index 83343b6f0c5..00000000000
--- a/tests/integration/Forms/Element/Check/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/SetUserOptionsCest.php b/tests/integration/Forms/Element/Check/SetUserOptionsCest.php
deleted file mode 100644
index 2d65de5235c..00000000000
--- a/tests/integration/Forms/Element/Check/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Check;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Check :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementCheckSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Check - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Check/ToStringCest.php b/tests/integration/Forms/Element/Check/ToStringCest.php
index 0352df60fcb..befe287c4db 100644
--- a/tests/integration/Forms/Element/Check/ToStringCest.php
+++ b/tests/integration/Forms/Element/Check/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementCheckToStringSimple(IntegrationTester $I)
 
         $element = new Check('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="checkbox" id="simple" name="simple" />',
             (string) $element
         );
@@ -75,7 +75,7 @@ public function formsElementCheckToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="checkbox" id="fantastic" name="fantastic" class="fancy" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/ClearCest.php b/tests/integration/Forms/Element/ClearCest.php
new file mode 100644
index 00000000000..827337b80ea
--- /dev/null
+++ b/tests/integration/Forms/Element/ClearCest.php
@@ -0,0 +1,71 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class ClearCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: clear()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementTextareaClear(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - clear() - ' . $example[0]);
+
+        $I->skipTest('Need implementation');
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/ConstructCest.php b/tests/integration/Forms/Element/ConstructCest.php
new file mode 100644
index 00000000000..64b017e460a
--- /dev/null
+++ b/tests/integration/Forms/Element/ConstructCest.php
@@ -0,0 +1,89 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class ConstructCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: __construct()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementTextareaConstruct(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - __construct() - ' . $example[0]);
+
+        $name   = uniqid();
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = $name;
+        $actual   = $object->getName();
+        $I->assertSame($expected, $actual);
+
+        $name       = uniqid();
+        $attributes = ["one" => "two"];
+        $object     = new $class($name, $attributes);
+
+        $expected = $name;
+        $actual   = $object->getName();
+        $I->assertSame($expected, $actual);
+
+        $expected = $attributes;
+        $actual   = $object->getAttributes();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/Date/AddFilterCest.php b/tests/integration/Forms/Element/Date/AddFilterCest.php
deleted file mode 100644
index ea476305410..00000000000
--- a/tests/integration/Forms/Element/Date/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/AddValidatorCest.php b/tests/integration/Forms/Element/Date/AddValidatorCest.php
deleted file mode 100644
index 024a88f31b6..00000000000
--- a/tests/integration/Forms/Element/Date/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/AddValidatorsCest.php b/tests/integration/Forms/Element/Date/AddValidatorsCest.php
deleted file mode 100644
index a356aa48d1d..00000000000
--- a/tests/integration/Forms/Element/Date/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/AppendMessageCest.php b/tests/integration/Forms/Element/Date/AppendMessageCest.php
deleted file mode 100644
index 64eab8fba5d..00000000000
--- a/tests/integration/Forms/Element/Date/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/ClearCest.php b/tests/integration/Forms/Element/Date/ClearCest.php
deleted file mode 100644
index 6c453acab9f..00000000000
--- a/tests/integration/Forms/Element/Date/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/ConstructCest.php b/tests/integration/Forms/Element/Date/ConstructCest.php
deleted file mode 100644
index 415e5e770c5..00000000000
--- a/tests/integration/Forms/Element/Date/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetAttributeCest.php b/tests/integration/Forms/Element/Date/GetAttributeCest.php
deleted file mode 100644
index ab0e9225aa3..00000000000
--- a/tests/integration/Forms/Element/Date/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetAttributesCest.php b/tests/integration/Forms/Element/Date/GetAttributesCest.php
deleted file mode 100644
index 97f987bb8e7..00000000000
--- a/tests/integration/Forms/Element/Date/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetDefaultCest.php b/tests/integration/Forms/Element/Date/GetDefaultCest.php
deleted file mode 100644
index f3418585917..00000000000
--- a/tests/integration/Forms/Element/Date/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetFiltersCest.php b/tests/integration/Forms/Element/Date/GetFiltersCest.php
deleted file mode 100644
index 034f327d29d..00000000000
--- a/tests/integration/Forms/Element/Date/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetLabelCest.php b/tests/integration/Forms/Element/Date/GetLabelCest.php
deleted file mode 100644
index d1e0c21d1a8..00000000000
--- a/tests/integration/Forms/Element/Date/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetMessagesCest.php b/tests/integration/Forms/Element/Date/GetMessagesCest.php
deleted file mode 100644
index 0cbfac3bfab..00000000000
--- a/tests/integration/Forms/Element/Date/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetSetFormCest.php b/tests/integration/Forms/Element/Date/GetSetFormCest.php
deleted file mode 100644
index 81bbad1b072..00000000000
--- a/tests/integration/Forms/Element/Date/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Date;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementDateGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getForm() / setForm()');
-
-        $address = new Date('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementDateGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getForm() / setForm()');
-
-        $address = new Date('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetSetNameCest.php b/tests/integration/Forms/Element/Date/GetSetNameCest.php
deleted file mode 100644
index 8e250ab9755..00000000000
--- a/tests/integration/Forms/Element/Date/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Date;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementDateGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getName() / setName()');
-
-        $element = new Date('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetUserOptionCest.php b/tests/integration/Forms/Element/Date/GetUserOptionCest.php
deleted file mode 100644
index f93f5ec79af..00000000000
--- a/tests/integration/Forms/Element/Date/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetUserOptionsCest.php b/tests/integration/Forms/Element/Date/GetUserOptionsCest.php
deleted file mode 100644
index e552e185408..00000000000
--- a/tests/integration/Forms/Element/Date/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetValidatorsCest.php b/tests/integration/Forms/Element/Date/GetValidatorsCest.php
deleted file mode 100644
index 1c7c7362806..00000000000
--- a/tests/integration/Forms/Element/Date/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/GetValueCest.php b/tests/integration/Forms/Element/Date/GetValueCest.php
deleted file mode 100644
index bacc1727f11..00000000000
--- a/tests/integration/Forms/Element/Date/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/HasMessagesCest.php b/tests/integration/Forms/Element/Date/HasMessagesCest.php
deleted file mode 100644
index 9f43b6bd5c4..00000000000
--- a/tests/integration/Forms/Element/Date/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/LabelCest.php b/tests/integration/Forms/Element/Date/LabelCest.php
deleted file mode 100644
index 62b4c68cf7e..00000000000
--- a/tests/integration/Forms/Element/Date/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/RenderCest.php b/tests/integration/Forms/Element/Date/RenderCest.php
index 15fe9725144..8ebd0a3ba78 100644
--- a/tests/integration/Forms/Element/Date/RenderCest.php
+++ b/tests/integration/Forms/Element/Date/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementDateRenderSimple(IntegrationTester $I)
 
         $element = new Date('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="date" id="simple" name="simple" />',
             $element->render()
         );
@@ -75,7 +75,7 @@ public function formsElementDateRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="date" id="fantastic" name="fantastic" class="fancy" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Date/SetAttributeCest.php b/tests/integration/Forms/Element/Date/SetAttributeCest.php
deleted file mode 100644
index c6bde4a9b2f..00000000000
--- a/tests/integration/Forms/Element/Date/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetAttributesCest.php b/tests/integration/Forms/Element/Date/SetAttributesCest.php
deleted file mode 100644
index 437d48e8772..00000000000
--- a/tests/integration/Forms/Element/Date/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetDefaultCest.php b/tests/integration/Forms/Element/Date/SetDefaultCest.php
deleted file mode 100644
index 97bafda3ae3..00000000000
--- a/tests/integration/Forms/Element/Date/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetFiltersCest.php b/tests/integration/Forms/Element/Date/SetFiltersCest.php
deleted file mode 100644
index 5b6e847e211..00000000000
--- a/tests/integration/Forms/Element/Date/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetLabelCest.php b/tests/integration/Forms/Element/Date/SetLabelCest.php
deleted file mode 100644
index 457931bb825..00000000000
--- a/tests/integration/Forms/Element/Date/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetMessagesCest.php b/tests/integration/Forms/Element/Date/SetMessagesCest.php
deleted file mode 100644
index b49cc956e90..00000000000
--- a/tests/integration/Forms/Element/Date/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetUserOptionCest.php b/tests/integration/Forms/Element/Date/SetUserOptionCest.php
deleted file mode 100644
index fd3fca3eb3e..00000000000
--- a/tests/integration/Forms/Element/Date/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/SetUserOptionsCest.php b/tests/integration/Forms/Element/Date/SetUserOptionsCest.php
deleted file mode 100644
index 784ae963a7b..00000000000
--- a/tests/integration/Forms/Element/Date/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Date;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Date :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementDateSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Date - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Date/ToStringCest.php b/tests/integration/Forms/Element/Date/ToStringCest.php
index 5807c31f3c4..2cea17294f4 100644
--- a/tests/integration/Forms/Element/Date/ToStringCest.php
+++ b/tests/integration/Forms/Element/Date/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementDateToStringSimple(IntegrationTester $I)
 
         $element = new Date('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="date" id="simple" name="simple" />',
             (string) $element
         );
@@ -75,7 +75,7 @@ public function formsElementDateToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="date" id="fantastic" name="fantastic" class="fancy" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/Email/AddFilterCest.php b/tests/integration/Forms/Element/Email/AddFilterCest.php
deleted file mode 100644
index bff4151a06a..00000000000
--- a/tests/integration/Forms/Element/Email/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/AddValidatorCest.php b/tests/integration/Forms/Element/Email/AddValidatorCest.php
deleted file mode 100644
index cee1738492e..00000000000
--- a/tests/integration/Forms/Element/Email/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/AddValidatorsCest.php b/tests/integration/Forms/Element/Email/AddValidatorsCest.php
deleted file mode 100644
index 0def3d0bb1f..00000000000
--- a/tests/integration/Forms/Element/Email/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/AppendMessageCest.php b/tests/integration/Forms/Element/Email/AppendMessageCest.php
deleted file mode 100644
index 3b1ec4eb77e..00000000000
--- a/tests/integration/Forms/Element/Email/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/ClearCest.php b/tests/integration/Forms/Element/Email/ClearCest.php
deleted file mode 100644
index cb421ae96f1..00000000000
--- a/tests/integration/Forms/Element/Email/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/ConstructCest.php b/tests/integration/Forms/Element/Email/ConstructCest.php
deleted file mode 100644
index e11cfe591cb..00000000000
--- a/tests/integration/Forms/Element/Email/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetAttributeCest.php b/tests/integration/Forms/Element/Email/GetAttributeCest.php
deleted file mode 100644
index 1ddb3fd2017..00000000000
--- a/tests/integration/Forms/Element/Email/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetAttributesCest.php b/tests/integration/Forms/Element/Email/GetAttributesCest.php
deleted file mode 100644
index 4ea5bdb1ed0..00000000000
--- a/tests/integration/Forms/Element/Email/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetDefaultCest.php b/tests/integration/Forms/Element/Email/GetDefaultCest.php
deleted file mode 100644
index b689d9bac65..00000000000
--- a/tests/integration/Forms/Element/Email/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetFiltersCest.php b/tests/integration/Forms/Element/Email/GetFiltersCest.php
deleted file mode 100644
index cecc21cbc4d..00000000000
--- a/tests/integration/Forms/Element/Email/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetLabelCest.php b/tests/integration/Forms/Element/Email/GetLabelCest.php
deleted file mode 100644
index 02b776e8edd..00000000000
--- a/tests/integration/Forms/Element/Email/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetMessagesCest.php b/tests/integration/Forms/Element/Email/GetMessagesCest.php
deleted file mode 100644
index a09201a7139..00000000000
--- a/tests/integration/Forms/Element/Email/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetSetFormCest.php b/tests/integration/Forms/Element/Email/GetSetFormCest.php
deleted file mode 100644
index 0d1d8f38bbc..00000000000
--- a/tests/integration/Forms/Element/Email/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Email;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementEmailGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getForm() / setForm()');
-
-        $address = new Email('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementEmailGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getForm() / setForm()');
-
-        $address = new Email('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetSetNameCest.php b/tests/integration/Forms/Element/Email/GetSetNameCest.php
deleted file mode 100644
index 22adaf6bcc6..00000000000
--- a/tests/integration/Forms/Element/Email/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Email;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementEmailGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getName() / setName()');
-
-        $element = new Email('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetUserOptionCest.php b/tests/integration/Forms/Element/Email/GetUserOptionCest.php
deleted file mode 100644
index e53a6661a27..00000000000
--- a/tests/integration/Forms/Element/Email/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetUserOptionsCest.php b/tests/integration/Forms/Element/Email/GetUserOptionsCest.php
deleted file mode 100644
index fd88b78a8bb..00000000000
--- a/tests/integration/Forms/Element/Email/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetValidatorsCest.php b/tests/integration/Forms/Element/Email/GetValidatorsCest.php
deleted file mode 100644
index 1df3efcc40e..00000000000
--- a/tests/integration/Forms/Element/Email/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/GetValueCest.php b/tests/integration/Forms/Element/Email/GetValueCest.php
deleted file mode 100644
index 8ecb253d73c..00000000000
--- a/tests/integration/Forms/Element/Email/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/HasMessagesCest.php b/tests/integration/Forms/Element/Email/HasMessagesCest.php
deleted file mode 100644
index 0c15c340edf..00000000000
--- a/tests/integration/Forms/Element/Email/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/LabelCest.php b/tests/integration/Forms/Element/Email/LabelCest.php
deleted file mode 100644
index 00ece0a151a..00000000000
--- a/tests/integration/Forms/Element/Email/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/RenderCest.php b/tests/integration/Forms/Element/Email/RenderCest.php
index a2cf41b68a4..15920948a7c 100644
--- a/tests/integration/Forms/Element/Email/RenderCest.php
+++ b/tests/integration/Forms/Element/Email/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementEmailRenderSimple(IntegrationTester $I)
 
         $element = new Email('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="email" id="simple" name="simple" />',
             $element->render()
         );
@@ -76,7 +76,7 @@ public function formsElementEmailRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="email" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Email/SetAttributeCest.php b/tests/integration/Forms/Element/Email/SetAttributeCest.php
deleted file mode 100644
index 009dea7bffe..00000000000
--- a/tests/integration/Forms/Element/Email/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetAttributesCest.php b/tests/integration/Forms/Element/Email/SetAttributesCest.php
deleted file mode 100644
index b792aa4ca30..00000000000
--- a/tests/integration/Forms/Element/Email/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetDefaultCest.php b/tests/integration/Forms/Element/Email/SetDefaultCest.php
deleted file mode 100644
index 6177c835ef8..00000000000
--- a/tests/integration/Forms/Element/Email/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetFiltersCest.php b/tests/integration/Forms/Element/Email/SetFiltersCest.php
deleted file mode 100644
index f55c08530b6..00000000000
--- a/tests/integration/Forms/Element/Email/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetLabelCest.php b/tests/integration/Forms/Element/Email/SetLabelCest.php
deleted file mode 100644
index 9ea916f8e7f..00000000000
--- a/tests/integration/Forms/Element/Email/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetMessagesCest.php b/tests/integration/Forms/Element/Email/SetMessagesCest.php
deleted file mode 100644
index 2a033d236e5..00000000000
--- a/tests/integration/Forms/Element/Email/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetUserOptionCest.php b/tests/integration/Forms/Element/Email/SetUserOptionCest.php
deleted file mode 100644
index 004f739e8d4..00000000000
--- a/tests/integration/Forms/Element/Email/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/SetUserOptionsCest.php b/tests/integration/Forms/Element/Email/SetUserOptionsCest.php
deleted file mode 100644
index 92cf778264e..00000000000
--- a/tests/integration/Forms/Element/Email/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Email;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Email :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementEmailSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Email - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Email/ToStringCest.php b/tests/integration/Forms/Element/Email/ToStringCest.php
index 59fcecbf9df..5a1bb7f7888 100644
--- a/tests/integration/Forms/Element/Email/ToStringCest.php
+++ b/tests/integration/Forms/Element/Email/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementEmailToStringSimple(IntegrationTester $I)
 
         $element = new Email('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="email" id="simple" name="simple" />',
             (string) $element
         );
@@ -76,7 +76,7 @@ public function formsElementEmailToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="email" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/File/AddFilterCest.php b/tests/integration/Forms/Element/File/AddFilterCest.php
deleted file mode 100644
index 3bd04ebdf90..00000000000
--- a/tests/integration/Forms/Element/File/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/AddValidatorCest.php b/tests/integration/Forms/Element/File/AddValidatorCest.php
deleted file mode 100644
index af9acfd8c54..00000000000
--- a/tests/integration/Forms/Element/File/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/AddValidatorsCest.php b/tests/integration/Forms/Element/File/AddValidatorsCest.php
deleted file mode 100644
index e9ca6d48304..00000000000
--- a/tests/integration/Forms/Element/File/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/AppendMessageCest.php b/tests/integration/Forms/Element/File/AppendMessageCest.php
deleted file mode 100644
index 52304b434ca..00000000000
--- a/tests/integration/Forms/Element/File/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/ClearCest.php b/tests/integration/Forms/Element/File/ClearCest.php
deleted file mode 100644
index d248757873f..00000000000
--- a/tests/integration/Forms/Element/File/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/ConstructCest.php b/tests/integration/Forms/Element/File/ConstructCest.php
deleted file mode 100644
index 0d771bf3933..00000000000
--- a/tests/integration/Forms/Element/File/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetAttributeCest.php b/tests/integration/Forms/Element/File/GetAttributeCest.php
deleted file mode 100644
index 6987296ba38..00000000000
--- a/tests/integration/Forms/Element/File/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetAttributesCest.php b/tests/integration/Forms/Element/File/GetAttributesCest.php
deleted file mode 100644
index 6ffa3d86eb2..00000000000
--- a/tests/integration/Forms/Element/File/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetDefaultCest.php b/tests/integration/Forms/Element/File/GetDefaultCest.php
deleted file mode 100644
index 6a1e58038e3..00000000000
--- a/tests/integration/Forms/Element/File/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetFiltersCest.php b/tests/integration/Forms/Element/File/GetFiltersCest.php
deleted file mode 100644
index 8cf6cd4d8f6..00000000000
--- a/tests/integration/Forms/Element/File/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetLabelCest.php b/tests/integration/Forms/Element/File/GetLabelCest.php
deleted file mode 100644
index 6d963fd7123..00000000000
--- a/tests/integration/Forms/Element/File/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetMessagesCest.php b/tests/integration/Forms/Element/File/GetMessagesCest.php
deleted file mode 100644
index 8de672cc7a4..00000000000
--- a/tests/integration/Forms/Element/File/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetSetFormCest.php b/tests/integration/Forms/Element/File/GetSetFormCest.php
deleted file mode 100644
index 4601157b005..00000000000
--- a/tests/integration/Forms/Element/File/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\File;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementFileGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getForm() / setForm()');
-
-        $address = new File('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\File :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementFileGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getForm() / setForm()');
-
-        $address = new File('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetSetNameCest.php b/tests/integration/Forms/Element/File/GetSetNameCest.php
deleted file mode 100644
index d6360f6d35e..00000000000
--- a/tests/integration/Forms/Element/File/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\File;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\File :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementFileGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getName() / setName()');
-
-        $element = new File('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetUserOptionCest.php b/tests/integration/Forms/Element/File/GetUserOptionCest.php
deleted file mode 100644
index febd3481e63..00000000000
--- a/tests/integration/Forms/Element/File/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetUserOptionsCest.php b/tests/integration/Forms/Element/File/GetUserOptionsCest.php
deleted file mode 100644
index 861ff59ee85..00000000000
--- a/tests/integration/Forms/Element/File/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetValidatorsCest.php b/tests/integration/Forms/Element/File/GetValidatorsCest.php
deleted file mode 100644
index 462f67d9147..00000000000
--- a/tests/integration/Forms/Element/File/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/GetValueCest.php b/tests/integration/Forms/Element/File/GetValueCest.php
deleted file mode 100644
index 57ccfb85d2d..00000000000
--- a/tests/integration/Forms/Element/File/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/HasMessagesCest.php b/tests/integration/Forms/Element/File/HasMessagesCest.php
deleted file mode 100644
index 9d62c7a1c35..00000000000
--- a/tests/integration/Forms/Element/File/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/LabelCest.php b/tests/integration/Forms/Element/File/LabelCest.php
deleted file mode 100644
index e82b1372411..00000000000
--- a/tests/integration/Forms/Element/File/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/RenderCest.php b/tests/integration/Forms/Element/File/RenderCest.php
index 15446f012cd..a21ac80c0ca 100644
--- a/tests/integration/Forms/Element/File/RenderCest.php
+++ b/tests/integration/Forms/Element/File/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementFileRenderSimple(IntegrationTester $I)
 
         $element = new File('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="file" id="simple" name="simple" />',
             $element->render()
         );
@@ -75,7 +75,7 @@ public function formsElementFileRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="file" id="fantastic" name="fantastic" class="fancy" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/File/SetAttributeCest.php b/tests/integration/Forms/Element/File/SetAttributeCest.php
deleted file mode 100644
index 530400e9ad0..00000000000
--- a/tests/integration/Forms/Element/File/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetAttributesCest.php b/tests/integration/Forms/Element/File/SetAttributesCest.php
deleted file mode 100644
index 0c6d3a78256..00000000000
--- a/tests/integration/Forms/Element/File/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetDefaultCest.php b/tests/integration/Forms/Element/File/SetDefaultCest.php
deleted file mode 100644
index 95065152945..00000000000
--- a/tests/integration/Forms/Element/File/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetFiltersCest.php b/tests/integration/Forms/Element/File/SetFiltersCest.php
deleted file mode 100644
index 31516976f16..00000000000
--- a/tests/integration/Forms/Element/File/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetLabelCest.php b/tests/integration/Forms/Element/File/SetLabelCest.php
deleted file mode 100644
index f8bac765390..00000000000
--- a/tests/integration/Forms/Element/File/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetMessagesCest.php b/tests/integration/Forms/Element/File/SetMessagesCest.php
deleted file mode 100644
index 2b62d4c41a3..00000000000
--- a/tests/integration/Forms/Element/File/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetUserOptionCest.php b/tests/integration/Forms/Element/File/SetUserOptionCest.php
deleted file mode 100644
index ebf22304acb..00000000000
--- a/tests/integration/Forms/Element/File/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/SetUserOptionsCest.php b/tests/integration/Forms/Element/File/SetUserOptionsCest.php
deleted file mode 100644
index a41b6765535..00000000000
--- a/tests/integration/Forms/Element/File/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\File;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\File :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementFileSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\File - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/File/ToStringCest.php b/tests/integration/Forms/Element/File/ToStringCest.php
index 76901b70750..745553cf123 100644
--- a/tests/integration/Forms/Element/File/ToStringCest.php
+++ b/tests/integration/Forms/Element/File/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementFileToStringSimple(IntegrationTester $I)
 
         $element = new File('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="file" id="simple" name="simple" />',
             (string) $element
         );
@@ -75,7 +75,7 @@ public function formsElementFileToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="file" id="fantastic" name="fantastic" class="fancy" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/GetAddValidatorsCest.php b/tests/integration/Forms/Element/GetAddValidatorsCest.php
new file mode 100644
index 00000000000..05b1ca41f8a
--- /dev/null
+++ b/tests/integration/Forms/Element/GetAddValidatorsCest.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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Filter\Validation\Validator\Alnum;
+use Phalcon\Filter\Validation\Validator\Date as ValidatorDate;
+use Phalcon\Filter\Validation\Validator\Digit;
+use Phalcon\Filter\Validation\Validator\StringLength;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
+
+use function uniqid;
+
+class GetAddValidatorsCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getValidators()/addValidator()/addValidators()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetAddValidators(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getValidators()/addValidator()/addValidators() - ' . $example[0]);
+
+        $name       = uniqid();
+        $one        = new StringLength();
+        $two        = new Alnum();
+        $three      = new Digit();
+        $validators = [$one, $two];
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = [];
+        $actual   = $object->getValidators();
+        $I->assertSame($expected, $actual);
+
+        $object->addValidators($validators);
+
+        $expected = $validators;
+        $actual   = $object->getValidators();
+        $I->assertSame($expected, $actual);
+
+        $object->addValidator($three);
+
+        $validators[] = $three;
+        $expected     = $validators;
+        $actual       = $object->getValidators();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetAttributeCest.php b/tests/integration/Forms/Element/GetSetAttributeCest.php
new file mode 100644
index 00000000000..a66d143a2f3
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetAttributeCest.php
@@ -0,0 +1,94 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class GetSetAttributeCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getAttribute()/setAttribute()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetAttribute(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getAttribute()/setAttribute() - ' . $example[0]);
+
+        $name  = uniqid();
+        $data = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = 'fallback';
+        $actual   = $object->getAttribute('one', 'fallback');
+        $I->assertSame($expected, $actual);
+
+        $object = new $class($name, $data);
+
+        $expected = 'two';
+        $actual   = $object->getAttribute('one', 'fallback');
+        $I->assertSame($expected, $actual);
+
+        $object->setAttribute('one', 'four');
+
+        $expected = 'four';
+        $actual   = $object->getAttribute('one', 'fallback');
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetAttributesCest.php b/tests/integration/Forms/Element/GetSetAttributesCest.php
new file mode 100644
index 00000000000..3f1b39a2418
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetAttributesCest.php
@@ -0,0 +1,96 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function array_flip;
+use function uniqid;
+
+class GetSetAttributesCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getAttributes()/setAttributes()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetAttributes(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getAttributes()/setAttributes() - ' . $example[0]);
+
+        $name   = uniqid();
+        $data  = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+        $flipped = array_flip($data);
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = [];
+        $actual   = $object->getAttributes();
+        $I->assertSame($expected, $actual);
+
+        $object = new $class($name, $data);
+
+        $expected = $data;
+        $actual   = $object->getAttributes();
+        $I->assertSame($expected, $actual);
+
+        $object->setAttributes($flipped);
+
+        $expected = $flipped;
+        $actual   = $object->getAttributes();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetDefaultCest.php b/tests/integration/Forms/Element/GetSetDefaultCest.php
new file mode 100644
index 00000000000..a4941fbea97
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetDefaultCest.php
@@ -0,0 +1,84 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class GetSetDefaultCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getDefault()/setDefault()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetDefault(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getDefault()/setDefault() - ' . $example[0]);
+
+        $name   = uniqid();
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $actual = $object->getDefault();
+        $I->assertNull($actual);
+
+        $object->setDefault($name);
+
+        $expected = $name;
+        $actual   = $object->getDefault();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetFiltersCest.php b/tests/integration/Forms/Element/GetSetFiltersCest.php
new file mode 100644
index 00000000000..c0e0d622e83
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetFiltersCest.php
@@ -0,0 +1,135 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+use Phalcon\Forms\Exception;
+
+use function array_flip;
+use function uniqid;
+
+class GetSetFiltersCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getFilters()/setFilters()/addFilter()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetAddFilters(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getFilters()/setFilters()/addFilter() - ' . $example[0]);
+
+        $name   = uniqid();
+        $data  = [
+            'trim',
+            'striptags',
+        ];
+        $flipped = array_flip($data);
+
+        $class   = $example[1];
+        $object  = new $class($name);
+
+        $expected = [];
+        $actual   = $object->getFilters();
+        $I->assertSame($expected, $actual);
+
+        $object->setFilters($flipped);
+
+        $expected = $flipped;
+        $actual   = $object->getFilters();
+        $I->assertSame($expected, $actual);
+
+        $object->setFilters('lower');
+
+        $expected = 'lower';
+        $actual   = $object->getFilters();
+        $I->assertSame($expected, $actual);
+
+        $object->addFilter('trim');
+
+        $expected = ['lower', 'trim'];
+        $actual   = $object->getFilters();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * Tests Phalcon\Forms\Element\* :: setFilters() - exception
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementSetFiltersException(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - setFilters() exception - ' . $example[0]);
+
+        $I->expectThrowable(
+            new Exception(
+                "The filter needs to be an array or string"
+            ),
+            function () use ($example) {
+                $name = uniqid();
+
+                $class  = $example[1];
+                $object = new $class($name);
+
+                $object->setFilters(1234);
+            }
+        );
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetFormCest.php b/tests/integration/Forms/Element/GetSetFormCest.php
new file mode 100644
index 00000000000..0dcdd4b01a2
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetFormCest.php
@@ -0,0 +1,110 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+use Phalcon\Forms\Form;
+
+use function uniqid;
+
+class GetSetFormCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getForm()/setForm()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetForm(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getForm()/setForm() - ' . $example[0]);
+
+        $name   = uniqid();
+        $class  = $example[1];
+        $object = new $class($name);
+        $form   = new Form();
+
+        $object->setForm($form);
+
+        $expected = $form;
+        $actual   = $object->getForm();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * Tests Phalcon\Forms\Element\* :: getForm()/add()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetFormAdd(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getForm()/add() - ' . $example[0]);
+
+        $name   = uniqid();
+        $class  = $example[1];
+        $object = new $class($name);
+        $form   = new Form();
+
+        $object->add($form);
+
+        $expected = $form;
+        $actual   = $object->getForm();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetHasAppendMessagesCest.php b/tests/integration/Forms/Element/GetSetHasAppendMessagesCest.php
new file mode 100644
index 00000000000..26e789afd21
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetHasAppendMessagesCest.php
@@ -0,0 +1,110 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
+
+use function uniqid;
+
+class GetSetHasAppendMessagesCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getMessages()/setMessages()/hasMessages()/appendMessage()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetAppendMessages(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getMessages()/setMessages()/appendMessage() - ' . $example[0]);
+
+        $name   = uniqid();
+        $one    = new Message('one', 'two');
+        $two    = new Message('three', 'four');
+        $three  = new Message('five', 'six');
+        $messages = new Messages(
+            [
+                $one,
+                $two,
+            ]
+        );
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $class  = Messages::class;
+        $actual = $object->getMessages();
+        $I->assertInstanceOf($class, $actual);
+
+        $actual = $object->hasMessages();
+        $I->assertFalse($actual);
+
+        $object->setMessages($messages);
+
+        $expected = $messages;
+        $actual   = $object->getMessages();
+        $I->assertSame($expected, $actual);
+
+        $object->appendMessage($three);
+
+        $messages[] = $three;
+        $expected   = $messages;
+        $actual     = $object->getMessages();
+        $I->assertSame($expected, $actual);
+
+        $actual = $object->hasMessages();
+        $I->assertTrue($actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetLabelCest.php b/tests/integration/Forms/Element/GetSetLabelCest.php
new file mode 100644
index 00000000000..7f49655abeb
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetLabelCest.php
@@ -0,0 +1,94 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+use Phalcon\Html\Escaper;
+use Phalcon\Html\TagFactory;
+
+use function uniqid;
+
+class GetSetLabelCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getLabel()/setLabel()/label()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetLabel(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getLabel()/setLabel()/label() - ' . $example[0]);
+
+        $name    = uniqid();
+        $class   = $example[1];
+        $factory = new TagFactory(new Escaper());
+        $object  = new $class($name);
+        $object->setTagFactory($factory);
+
+        $actual = $object->getLabel();
+        $I->assertNull($actual);
+
+        $object->setLabel($name);
+
+        $expected = $name;
+        $actual   = $object->getLabel();
+        $I->assertSame($expected, $actual);
+
+        $attributes = ['class' => 'label label-warning'];
+        $expected   = '<label for="' . $name
+            . '" class="label label-warning">' . $name . '</label>';
+        $actual     = $object->label($attributes);
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetNameCest.php b/tests/integration/Forms/Element/GetSetNameCest.php
new file mode 100644
index 00000000000..697dfbd8c13
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetNameCest.php
@@ -0,0 +1,86 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class GetSetNameCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getName()/setName()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetName(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getName()/setName() - ' . $example[0]);
+
+        $name   = uniqid();
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = $name;
+        $actual   = $object->getName();
+        $I->assertSame($expected, $actual);
+
+        $different = uniqid();
+        $object->setName($different);
+
+        $expected = $different;
+        $actual   = $object->getName();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetUserOptionCest.php b/tests/integration/Forms/Element/GetSetUserOptionCest.php
new file mode 100644
index 00000000000..c685ae0c487
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetUserOptionCest.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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class GetSetUserOptionCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getUserOption()/setUserOption()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetUserOption(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getUserOption()/setUserOption() - ' . $example[0]);
+
+        $name  = uniqid();
+        $data = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = 'fallback';
+        $actual   = $object->getUserOption('one', 'fallback');
+        $I->assertSame($expected, $actual);
+
+        $object->setUserOption('one', 'four');
+
+        $expected = 'four';
+        $actual   = $object->getUserOption('one', 'fallback');
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/GetSetUserOptionsCest.php b/tests/integration/Forms/Element/GetSetUserOptionsCest.php
new file mode 100644
index 00000000000..52771026e2c
--- /dev/null
+++ b/tests/integration/Forms/Element/GetSetUserOptionsCest.php
@@ -0,0 +1,92 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function array_flip;
+use function uniqid;
+
+class GetSetUserOptionsCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\* :: getUserOptions()/setUserOptions()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementGetSetUserOptions(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - getUserOptions()/setUserOptions() - ' . $example[0]);
+
+        $name   = uniqid();
+        $data  = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+        $flipped = array_flip($data);
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = [];
+        $actual   = $object->getUserOptions();
+        $I->assertSame($expected, $actual);
+
+        $object->setUserOptions($flipped);
+
+        $expected = $flipped;
+        $actual   = $object->getUserOptions();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Select", Select::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/TextArea/GetValueCest.php b/tests/integration/Forms/Element/GetValueCest.php
similarity index 91%
rename from tests/integration/Forms/Element/TextArea/GetValueCest.php
rename to tests/integration/Forms/Element/GetValueCest.php
index 68780fe4e6d..061bd04db9e 100644
--- a/tests/integration/Forms/Element/TextArea/GetValueCest.php
+++ b/tests/integration/Forms/Element/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Forms\Element\TextArea;
+namespace Phalcon\Tests\Integration\Forms\Element;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Forms/Element/Hidden/AddFilterCest.php b/tests/integration/Forms/Element/Hidden/AddFilterCest.php
deleted file mode 100644
index 3f418e3b780..00000000000
--- a/tests/integration/Forms/Element/Hidden/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/AddValidatorCest.php b/tests/integration/Forms/Element/Hidden/AddValidatorCest.php
deleted file mode 100644
index ee7540108c3..00000000000
--- a/tests/integration/Forms/Element/Hidden/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php b/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php
deleted file mode 100644
index 1beb2d922ba..00000000000
--- a/tests/integration/Forms/Element/Hidden/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/AppendMessageCest.php b/tests/integration/Forms/Element/Hidden/AppendMessageCest.php
deleted file mode 100644
index 3e5bad97848..00000000000
--- a/tests/integration/Forms/Element/Hidden/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/ClearCest.php b/tests/integration/Forms/Element/Hidden/ClearCest.php
deleted file mode 100644
index 584020be2ad..00000000000
--- a/tests/integration/Forms/Element/Hidden/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/ConstructCest.php b/tests/integration/Forms/Element/Hidden/ConstructCest.php
deleted file mode 100644
index 0ed0f6c0444..00000000000
--- a/tests/integration/Forms/Element/Hidden/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetAttributeCest.php b/tests/integration/Forms/Element/Hidden/GetAttributeCest.php
deleted file mode 100644
index b898c4e3a5a..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetAttributesCest.php b/tests/integration/Forms/Element/Hidden/GetAttributesCest.php
deleted file mode 100644
index 586c4c3e29a..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetDefaultCest.php b/tests/integration/Forms/Element/Hidden/GetDefaultCest.php
deleted file mode 100644
index 8962ecd863a..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetFiltersCest.php b/tests/integration/Forms/Element/Hidden/GetFiltersCest.php
deleted file mode 100644
index 2d25fea264f..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetLabelCest.php b/tests/integration/Forms/Element/Hidden/GetLabelCest.php
deleted file mode 100644
index 5fd3fe34c9e..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetMessagesCest.php b/tests/integration/Forms/Element/Hidden/GetMessagesCest.php
deleted file mode 100644
index a7f22ab0c4d..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetSetFormCest.php b/tests/integration/Forms/Element/Hidden/GetSetFormCest.php
deleted file mode 100644
index 6d0d354d32c..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Hidden;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementHiddenGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getForm() / setForm()');
-
-        $address = new Hidden('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementHiddenGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getForm() / setForm()');
-
-        $address = new Hidden('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetSetNameCest.php b/tests/integration/Forms/Element/Hidden/GetSetNameCest.php
deleted file mode 100644
index 34643f60cb2..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Hidden;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementHiddenGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getName() / setName()');
-
-        $element = new Hidden('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php b/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php
deleted file mode 100644
index 38635d1aa2e..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php b/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php
deleted file mode 100644
index a9dc8508463..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php b/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php
deleted file mode 100644
index 0345f45f93f..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/GetValueCest.php b/tests/integration/Forms/Element/Hidden/GetValueCest.php
deleted file mode 100644
index b9da109da4e..00000000000
--- a/tests/integration/Forms/Element/Hidden/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/HasMessagesCest.php b/tests/integration/Forms/Element/Hidden/HasMessagesCest.php
deleted file mode 100644
index 9e391abb0b2..00000000000
--- a/tests/integration/Forms/Element/Hidden/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/LabelCest.php b/tests/integration/Forms/Element/Hidden/LabelCest.php
deleted file mode 100644
index 0d5285bf8e9..00000000000
--- a/tests/integration/Forms/Element/Hidden/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/RenderCest.php b/tests/integration/Forms/Element/Hidden/RenderCest.php
index 54573c7043d..c5e5edec696 100644
--- a/tests/integration/Forms/Element/Hidden/RenderCest.php
+++ b/tests/integration/Forms/Element/Hidden/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementHiddenRenderSimple(IntegrationTester $I)
 
         $element = new Hidden('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="hidden" id="simple" name="simple" />',
             $element->render()
         );
@@ -75,7 +75,7 @@ public function formsElementHiddenRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="hidden" id="fantastic" name="fantastic" class="fancy" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Hidden/SetAttributeCest.php b/tests/integration/Forms/Element/Hidden/SetAttributeCest.php
deleted file mode 100644
index a2e314d99a5..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetAttributesCest.php b/tests/integration/Forms/Element/Hidden/SetAttributesCest.php
deleted file mode 100644
index ec28a30bb0a..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetDefaultCest.php b/tests/integration/Forms/Element/Hidden/SetDefaultCest.php
deleted file mode 100644
index 5c61abb5ec2..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetFiltersCest.php b/tests/integration/Forms/Element/Hidden/SetFiltersCest.php
deleted file mode 100644
index 19f3d01002f..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetLabelCest.php b/tests/integration/Forms/Element/Hidden/SetLabelCest.php
deleted file mode 100644
index 58726d098c3..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetMessagesCest.php b/tests/integration/Forms/Element/Hidden/SetMessagesCest.php
deleted file mode 100644
index be71aa64610..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php b/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php
deleted file mode 100644
index 0df29e0a66e..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php b/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php
deleted file mode 100644
index a4322660e4c..00000000000
--- a/tests/integration/Forms/Element/Hidden/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Hidden;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Hidden :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementHiddenSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Hidden - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Hidden/ToStringCest.php b/tests/integration/Forms/Element/Hidden/ToStringCest.php
index 11d4f4a35ba..065d27899cc 100644
--- a/tests/integration/Forms/Element/Hidden/ToStringCest.php
+++ b/tests/integration/Forms/Element/Hidden/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementHiddenToStringSimple(IntegrationTester $I)
 
         $element = new Hidden('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="hidden" id="simple" name="simple" />',
             (string) $element
         );
@@ -75,7 +75,7 @@ public function formsElementHiddenToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="hidden" id="fantastic" name="fantastic" class="fancy" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/Numeric/AddFilterCest.php b/tests/integration/Forms/Element/Numeric/AddFilterCest.php
deleted file mode 100644
index d268adb2b0f..00000000000
--- a/tests/integration/Forms/Element/Numeric/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/AddValidatorCest.php b/tests/integration/Forms/Element/Numeric/AddValidatorCest.php
deleted file mode 100644
index ca6cc3bb9ee..00000000000
--- a/tests/integration/Forms/Element/Numeric/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php b/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php
deleted file mode 100644
index 96ec20f4626..00000000000
--- a/tests/integration/Forms/Element/Numeric/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/AppendMessageCest.php b/tests/integration/Forms/Element/Numeric/AppendMessageCest.php
deleted file mode 100644
index a952928c2a2..00000000000
--- a/tests/integration/Forms/Element/Numeric/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/ClearCest.php b/tests/integration/Forms/Element/Numeric/ClearCest.php
deleted file mode 100644
index aadc07b7b8e..00000000000
--- a/tests/integration/Forms/Element/Numeric/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/ConstructCest.php b/tests/integration/Forms/Element/Numeric/ConstructCest.php
deleted file mode 100644
index df4abcd85b1..00000000000
--- a/tests/integration/Forms/Element/Numeric/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetAttributeCest.php b/tests/integration/Forms/Element/Numeric/GetAttributeCest.php
deleted file mode 100644
index 05d0afe471b..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetAttributesCest.php b/tests/integration/Forms/Element/Numeric/GetAttributesCest.php
deleted file mode 100644
index 03f78498a38..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetDefaultCest.php b/tests/integration/Forms/Element/Numeric/GetDefaultCest.php
deleted file mode 100644
index 6aaf95ac47c..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetFiltersCest.php b/tests/integration/Forms/Element/Numeric/GetFiltersCest.php
deleted file mode 100644
index b177d25ab48..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetLabelCest.php b/tests/integration/Forms/Element/Numeric/GetLabelCest.php
deleted file mode 100644
index 1bc88d0c5b2..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetMessagesCest.php b/tests/integration/Forms/Element/Numeric/GetMessagesCest.php
deleted file mode 100644
index 008a53ae713..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetSetFormCest.php b/tests/integration/Forms/Element/Numeric/GetSetFormCest.php
deleted file mode 100644
index d6433b981df..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Numeric;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementNumericGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getForm() / setForm()');
-
-        $address = new Numeric('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementNumericGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getForm() / setForm()');
-
-        $address = new Numeric('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetSetNameCest.php b/tests/integration/Forms/Element/Numeric/GetSetNameCest.php
deleted file mode 100644
index 5cd5218b220..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Numeric;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementNumericGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getName() / setName()');
-
-        $element = new Numeric('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php b/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php
deleted file mode 100644
index c7e997d8dcb..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php b/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php
deleted file mode 100644
index 4c933267746..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php b/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php
deleted file mode 100644
index 6f9e5256855..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/GetValueCest.php b/tests/integration/Forms/Element/Numeric/GetValueCest.php
deleted file mode 100644
index e51781bcdd6..00000000000
--- a/tests/integration/Forms/Element/Numeric/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/HasMessagesCest.php b/tests/integration/Forms/Element/Numeric/HasMessagesCest.php
deleted file mode 100644
index 8c8f8a99785..00000000000
--- a/tests/integration/Forms/Element/Numeric/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/LabelCest.php b/tests/integration/Forms/Element/Numeric/LabelCest.php
deleted file mode 100644
index 3ce380e4a86..00000000000
--- a/tests/integration/Forms/Element/Numeric/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/RenderCest.php b/tests/integration/Forms/Element/Numeric/RenderCest.php
index 01a167089d4..ba94bb7921c 100644
--- a/tests/integration/Forms/Element/Numeric/RenderCest.php
+++ b/tests/integration/Forms/Element/Numeric/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementNumericRenderSimple(IntegrationTester $I)
 
         $element = new Numeric('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="number" id="simple" name="simple" />',
             $element->render()
         );
@@ -76,7 +76,7 @@ public function formsElementNumericRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="number" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Numeric/SetAttributeCest.php b/tests/integration/Forms/Element/Numeric/SetAttributeCest.php
deleted file mode 100644
index a8a2cef6f68..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetAttributesCest.php b/tests/integration/Forms/Element/Numeric/SetAttributesCest.php
deleted file mode 100644
index 77637e52b15..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetDefaultCest.php b/tests/integration/Forms/Element/Numeric/SetDefaultCest.php
deleted file mode 100644
index 5be54d654cb..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetFiltersCest.php b/tests/integration/Forms/Element/Numeric/SetFiltersCest.php
deleted file mode 100644
index d3806e3d08d..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetLabelCest.php b/tests/integration/Forms/Element/Numeric/SetLabelCest.php
deleted file mode 100644
index 580249ca38b..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetMessagesCest.php b/tests/integration/Forms/Element/Numeric/SetMessagesCest.php
deleted file mode 100644
index 4fdf4e26cca..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php b/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php
deleted file mode 100644
index 0d4adcb4c05..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php b/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php
deleted file mode 100644
index caf9b5e78b6..00000000000
--- a/tests/integration/Forms/Element/Numeric/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Numeric;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Numeric :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementNumericSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Numeric - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Numeric/ToStringCest.php b/tests/integration/Forms/Element/Numeric/ToStringCest.php
index 643d49b93a7..8e8bca2c4d9 100644
--- a/tests/integration/Forms/Element/Numeric/ToStringCest.php
+++ b/tests/integration/Forms/Element/Numeric/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementNumericToStringSimple(IntegrationTester $I)
 
         $element = new Numeric('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="number" id="simple" name="simple" />',
             (string) $element
         );
@@ -76,7 +76,7 @@ public function formsElementNumericToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="number" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/Password/AddFilterCest.php b/tests/integration/Forms/Element/Password/AddFilterCest.php
deleted file mode 100644
index f95976f0b42..00000000000
--- a/tests/integration/Forms/Element/Password/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/AddValidatorCest.php b/tests/integration/Forms/Element/Password/AddValidatorCest.php
deleted file mode 100644
index 88e6feebb0b..00000000000
--- a/tests/integration/Forms/Element/Password/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/AddValidatorsCest.php b/tests/integration/Forms/Element/Password/AddValidatorsCest.php
deleted file mode 100644
index b637976e68d..00000000000
--- a/tests/integration/Forms/Element/Password/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/AppendMessageCest.php b/tests/integration/Forms/Element/Password/AppendMessageCest.php
deleted file mode 100644
index ffdf904fa19..00000000000
--- a/tests/integration/Forms/Element/Password/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/ClearCest.php b/tests/integration/Forms/Element/Password/ClearCest.php
deleted file mode 100644
index 872078440e8..00000000000
--- a/tests/integration/Forms/Element/Password/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/ConstructCest.php b/tests/integration/Forms/Element/Password/ConstructCest.php
deleted file mode 100644
index 0a838b7c9f3..00000000000
--- a/tests/integration/Forms/Element/Password/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetAttributeCest.php b/tests/integration/Forms/Element/Password/GetAttributeCest.php
deleted file mode 100644
index 1b0d4468e45..00000000000
--- a/tests/integration/Forms/Element/Password/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetAttributesCest.php b/tests/integration/Forms/Element/Password/GetAttributesCest.php
deleted file mode 100644
index 9bcae9edd35..00000000000
--- a/tests/integration/Forms/Element/Password/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetDefaultCest.php b/tests/integration/Forms/Element/Password/GetDefaultCest.php
deleted file mode 100644
index a965d6314b0..00000000000
--- a/tests/integration/Forms/Element/Password/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetFiltersCest.php b/tests/integration/Forms/Element/Password/GetFiltersCest.php
deleted file mode 100644
index 2154a58b8cf..00000000000
--- a/tests/integration/Forms/Element/Password/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetLabelCest.php b/tests/integration/Forms/Element/Password/GetLabelCest.php
deleted file mode 100644
index 58bb085421e..00000000000
--- a/tests/integration/Forms/Element/Password/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetMessagesCest.php b/tests/integration/Forms/Element/Password/GetMessagesCest.php
deleted file mode 100644
index 229aafa0e6a..00000000000
--- a/tests/integration/Forms/Element/Password/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetSetFormCest.php b/tests/integration/Forms/Element/Password/GetSetFormCest.php
deleted file mode 100644
index 9c018c41fcf..00000000000
--- a/tests/integration/Forms/Element/Password/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Password;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementPasswordGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getForm() / setForm()');
-
-        $address = new Password('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementPasswordGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getForm() / setForm()');
-
-        $address = new Password('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetSetNameCest.php b/tests/integration/Forms/Element/Password/GetSetNameCest.php
deleted file mode 100644
index c2dff691b1a..00000000000
--- a/tests/integration/Forms/Element/Password/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Password;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementPasswordGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getName() / setName()');
-
-        $element = new Password('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetUserOptionCest.php b/tests/integration/Forms/Element/Password/GetUserOptionCest.php
deleted file mode 100644
index 23fd8680e15..00000000000
--- a/tests/integration/Forms/Element/Password/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetUserOptionsCest.php b/tests/integration/Forms/Element/Password/GetUserOptionsCest.php
deleted file mode 100644
index 11e00e3d2d1..00000000000
--- a/tests/integration/Forms/Element/Password/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetValidatorsCest.php b/tests/integration/Forms/Element/Password/GetValidatorsCest.php
deleted file mode 100644
index 8768f0ed116..00000000000
--- a/tests/integration/Forms/Element/Password/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/GetValueCest.php b/tests/integration/Forms/Element/Password/GetValueCest.php
deleted file mode 100644
index eabb28d7d32..00000000000
--- a/tests/integration/Forms/Element/Password/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/HasMessagesCest.php b/tests/integration/Forms/Element/Password/HasMessagesCest.php
deleted file mode 100644
index b9d28206fb5..00000000000
--- a/tests/integration/Forms/Element/Password/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/LabelCest.php b/tests/integration/Forms/Element/Password/LabelCest.php
deleted file mode 100644
index 453f019f5fd..00000000000
--- a/tests/integration/Forms/Element/Password/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/RenderCest.php b/tests/integration/Forms/Element/Password/RenderCest.php
index 5e1bc5e55b9..bc9fed03478 100644
--- a/tests/integration/Forms/Element/Password/RenderCest.php
+++ b/tests/integration/Forms/Element/Password/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementPasswordRenderSimple(IntegrationTester $I)
 
         $element = new Password('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="password" id="simple" name="simple" />',
             $element->render()
         );
@@ -76,7 +76,7 @@ public function formsElementPasswordRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="password" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Password/SetAttributeCest.php b/tests/integration/Forms/Element/Password/SetAttributeCest.php
deleted file mode 100644
index f26ef7f69e9..00000000000
--- a/tests/integration/Forms/Element/Password/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetAttributesCest.php b/tests/integration/Forms/Element/Password/SetAttributesCest.php
deleted file mode 100644
index 99fdc095afe..00000000000
--- a/tests/integration/Forms/Element/Password/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetDefaultCest.php b/tests/integration/Forms/Element/Password/SetDefaultCest.php
deleted file mode 100644
index b52b0f58543..00000000000
--- a/tests/integration/Forms/Element/Password/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetFiltersCest.php b/tests/integration/Forms/Element/Password/SetFiltersCest.php
deleted file mode 100644
index aab035ed70f..00000000000
--- a/tests/integration/Forms/Element/Password/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetLabelCest.php b/tests/integration/Forms/Element/Password/SetLabelCest.php
deleted file mode 100644
index 3aeeee66801..00000000000
--- a/tests/integration/Forms/Element/Password/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetMessagesCest.php b/tests/integration/Forms/Element/Password/SetMessagesCest.php
deleted file mode 100644
index ee210ee8155..00000000000
--- a/tests/integration/Forms/Element/Password/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetUserOptionCest.php b/tests/integration/Forms/Element/Password/SetUserOptionCest.php
deleted file mode 100644
index f841b8972d7..00000000000
--- a/tests/integration/Forms/Element/Password/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/SetUserOptionsCest.php b/tests/integration/Forms/Element/Password/SetUserOptionsCest.php
deleted file mode 100644
index 691cd123308..00000000000
--- a/tests/integration/Forms/Element/Password/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Password;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Password :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementPasswordSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Password - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Password/ToStringCest.php b/tests/integration/Forms/Element/Password/ToStringCest.php
index c49776b6de0..4cf3061efd3 100644
--- a/tests/integration/Forms/Element/Password/ToStringCest.php
+++ b/tests/integration/Forms/Element/Password/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementPasswordToStringSimple(IntegrationTester $I)
 
         $element = new Password('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="password" id="simple" name="simple" />',
             (string) $element
         );
@@ -76,7 +76,7 @@ public function formsElementPasswordToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="password" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/Radio/AddFilterCest.php b/tests/integration/Forms/Element/Radio/AddFilterCest.php
deleted file mode 100644
index 201b115c504..00000000000
--- a/tests/integration/Forms/Element/Radio/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/AddValidatorCest.php b/tests/integration/Forms/Element/Radio/AddValidatorCest.php
deleted file mode 100644
index 439b8754461..00000000000
--- a/tests/integration/Forms/Element/Radio/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/AddValidatorsCest.php b/tests/integration/Forms/Element/Radio/AddValidatorsCest.php
deleted file mode 100644
index 450632c7e71..00000000000
--- a/tests/integration/Forms/Element/Radio/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/AppendMessageCest.php b/tests/integration/Forms/Element/Radio/AppendMessageCest.php
deleted file mode 100644
index aa24bba4ff4..00000000000
--- a/tests/integration/Forms/Element/Radio/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/ClearCest.php b/tests/integration/Forms/Element/Radio/ClearCest.php
deleted file mode 100644
index a7790791a33..00000000000
--- a/tests/integration/Forms/Element/Radio/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/ConstructCest.php b/tests/integration/Forms/Element/Radio/ConstructCest.php
deleted file mode 100644
index 9a79f66aaaf..00000000000
--- a/tests/integration/Forms/Element/Radio/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetAttributeCest.php b/tests/integration/Forms/Element/Radio/GetAttributeCest.php
deleted file mode 100644
index af871c18ff9..00000000000
--- a/tests/integration/Forms/Element/Radio/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetAttributesCest.php b/tests/integration/Forms/Element/Radio/GetAttributesCest.php
deleted file mode 100644
index 07b3284b232..00000000000
--- a/tests/integration/Forms/Element/Radio/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetDefaultCest.php b/tests/integration/Forms/Element/Radio/GetDefaultCest.php
deleted file mode 100644
index fb26c5ebb05..00000000000
--- a/tests/integration/Forms/Element/Radio/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetFiltersCest.php b/tests/integration/Forms/Element/Radio/GetFiltersCest.php
deleted file mode 100644
index b6dcc5316b6..00000000000
--- a/tests/integration/Forms/Element/Radio/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetLabelCest.php b/tests/integration/Forms/Element/Radio/GetLabelCest.php
deleted file mode 100644
index c6808b996fa..00000000000
--- a/tests/integration/Forms/Element/Radio/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetMessagesCest.php b/tests/integration/Forms/Element/Radio/GetMessagesCest.php
deleted file mode 100644
index 825851185d2..00000000000
--- a/tests/integration/Forms/Element/Radio/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetSetFormCest.php b/tests/integration/Forms/Element/Radio/GetSetFormCest.php
deleted file mode 100644
index 9a5568df224..00000000000
--- a/tests/integration/Forms/Element/Radio/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Radio;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementRadioGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getForm() / setForm()');
-
-        $address = new Radio('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementRadioGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getForm() / setForm()');
-
-        $address = new Radio('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetSetNameCest.php b/tests/integration/Forms/Element/Radio/GetSetNameCest.php
deleted file mode 100644
index 401c50d1ddf..00000000000
--- a/tests/integration/Forms/Element/Radio/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Radio;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementRadioGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getName() / setName()');
-
-        $element = new Radio('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetUserOptionCest.php b/tests/integration/Forms/Element/Radio/GetUserOptionCest.php
deleted file mode 100644
index b5bf3897a19..00000000000
--- a/tests/integration/Forms/Element/Radio/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php b/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php
deleted file mode 100644
index e175f87fc48..00000000000
--- a/tests/integration/Forms/Element/Radio/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetValidatorsCest.php b/tests/integration/Forms/Element/Radio/GetValidatorsCest.php
deleted file mode 100644
index 39614376cf5..00000000000
--- a/tests/integration/Forms/Element/Radio/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/GetValueCest.php b/tests/integration/Forms/Element/Radio/GetValueCest.php
deleted file mode 100644
index 4801363c7ac..00000000000
--- a/tests/integration/Forms/Element/Radio/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/HasMessagesCest.php b/tests/integration/Forms/Element/Radio/HasMessagesCest.php
deleted file mode 100644
index 8eb8fa2d61e..00000000000
--- a/tests/integration/Forms/Element/Radio/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/LabelCest.php b/tests/integration/Forms/Element/Radio/LabelCest.php
deleted file mode 100644
index c9320566707..00000000000
--- a/tests/integration/Forms/Element/Radio/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/RenderCest.php b/tests/integration/Forms/Element/Radio/RenderCest.php
index 5f14a8a9bdc..14977f14233 100644
--- a/tests/integration/Forms/Element/Radio/RenderCest.php
+++ b/tests/integration/Forms/Element/Radio/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementRadioRenderSimple(IntegrationTester $I)
 
         $element = new Radio('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="radio" id="simple" name="simple" />',
             $element->render()
         );
@@ -75,7 +75,7 @@ public function formsElementRadioRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="radio" id="fantastic" name="fantastic" class="fancy" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Radio/SetAttributeCest.php b/tests/integration/Forms/Element/Radio/SetAttributeCest.php
deleted file mode 100644
index 86e166c30f1..00000000000
--- a/tests/integration/Forms/Element/Radio/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetAttributesCest.php b/tests/integration/Forms/Element/Radio/SetAttributesCest.php
deleted file mode 100644
index 87442eb1b9e..00000000000
--- a/tests/integration/Forms/Element/Radio/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetDefaultCest.php b/tests/integration/Forms/Element/Radio/SetDefaultCest.php
deleted file mode 100644
index 5d57a085979..00000000000
--- a/tests/integration/Forms/Element/Radio/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetFiltersCest.php b/tests/integration/Forms/Element/Radio/SetFiltersCest.php
deleted file mode 100644
index 2686346dbe9..00000000000
--- a/tests/integration/Forms/Element/Radio/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetLabelCest.php b/tests/integration/Forms/Element/Radio/SetLabelCest.php
deleted file mode 100644
index fd1d253aca3..00000000000
--- a/tests/integration/Forms/Element/Radio/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetMessagesCest.php b/tests/integration/Forms/Element/Radio/SetMessagesCest.php
deleted file mode 100644
index 9fb448bbb5e..00000000000
--- a/tests/integration/Forms/Element/Radio/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetUserOptionCest.php b/tests/integration/Forms/Element/Radio/SetUserOptionCest.php
deleted file mode 100644
index e49233b6fae..00000000000
--- a/tests/integration/Forms/Element/Radio/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php b/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php
deleted file mode 100644
index c8c086b538d..00000000000
--- a/tests/integration/Forms/Element/Radio/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Radio;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Radio :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementRadioSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Radio - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Radio/ToStringCest.php b/tests/integration/Forms/Element/Radio/ToStringCest.php
index e3fd3ec6230..039812f0e4e 100644
--- a/tests/integration/Forms/Element/Radio/ToStringCest.php
+++ b/tests/integration/Forms/Element/Radio/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementRadioToStringSimple(IntegrationTester $I)
 
         $element = new Radio('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="radio" id="simple" name="simple" />',
             (string) $element
         );
@@ -75,7 +75,7 @@ public function formsElementRadioToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="radio" id="fantastic" name="fantastic" class="fancy" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/RenderCest.php b/tests/integration/Forms/Element/RenderCest.php
new file mode 100644
index 00000000000..17141688e67
--- /dev/null
+++ b/tests/integration/Forms/Element/RenderCest.php
@@ -0,0 +1,161 @@
+<?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\Integration\Forms\Element;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Select;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+use Phalcon\Html\Escaper;
+use Phalcon\Html\TagFactory;
+
+use function uniqid;
+
+class RenderCest
+{
+//    /**
+//     * Tests Phalcon\Forms\Element\Check :: render() with parameters
+//     *
+//     * @author Sid Roberts <https://github.com/SidRoberts>
+//     * @since  2019-05-23
+//     */
+//    public function formsElementCheckRenderWithParameters(IntegrationTester $I)
+//    {
+//        $I->wantToTest('Forms\Element\Check - render() with parameters');
+//
+//        $element = new Check(
+//            'fantastic',
+//            [
+//                'class' => 'fancy',
+//            ]
+//        );
+//
+//        $I->assertSame(
+//            '<input type="checkbox" id="fantastic" name="fantastic" class="fancy" />',
+//            $element->render()
+//        );
+//    }
+
+    /**
+     * Tests Phalcon\Forms\Element\* :: clear()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementRender(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\* - render() - ' . $example[0]);
+
+        $name    = uniqid();
+        $class   = $example[1];
+        $factory = new TagFactory(new Escaper());
+        $object  = new $class($name);
+        $object->setTagFactory($factory);
+
+        $expected = str_replace(":name:", $name, $example[2]);
+        $actual   = $object->render();
+
+var_dump($actual);
+var_dump((string) $object);
+
+        $I->assertSame($expected, $actual);
+
+//        $actual = (string) $object;
+//        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+//            [
+//                "Check",
+//                Check::class,
+//                '<input type="checkbox" id=":name:" name=":name:" />',
+//            ],
+            [
+                "Date",
+                Date::class,
+                '<input type="date" id=":name:" name=":name:" />',
+            ],
+//            [
+//                "Email",
+//                Email::class,
+//                "",
+//            ],
+//            [
+//                "File",
+//                File::class,
+//                "",
+//            ],
+//            [
+//                "Hidden",
+//                Hidden::class,
+//                "",
+//            ],
+//            [
+//                "Numeric",
+//                Numeric::class,
+//                "",
+//            ],
+//            [
+//                "Password",
+//                Password::class,
+//                "",
+//            ],
+//            [
+//                "Radio",
+//                Radio::class,
+//                "",
+//            ],
+//            [
+//                "Select",
+//                Select::class,
+//                "",
+//            ],
+//            [
+//                "Submit",
+//                Submit::class,
+//                "",
+//            ],
+//            [
+//                "Text",
+//                Text::class,
+//                "",
+//            ],
+//            [
+//                "TextArea",
+//                TextArea::class,
+//                "",
+//            ],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/Select/AddFilterCest.php b/tests/integration/Forms/Element/Select/AddFilterCest.php
deleted file mode 100644
index 1eb905a92a2..00000000000
--- a/tests/integration/Forms/Element/Select/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/AddOptionCest.php b/tests/integration/Forms/Element/Select/AddOptionCest.php
index 373dfcfc0a5..df0a761ab30 100644
--- a/tests/integration/Forms/Element/Select/AddOptionCest.php
+++ b/tests/integration/Forms/Element/Select/AddOptionCest.php
@@ -41,7 +41,7 @@ public function testCorrectlyAddOptionToSelectElementIfParameterIsAnArray(Integr
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<select id="test-select" name="test-select"><option value="key">value</option></select>',
             preg_replace(
                 '/[[:cntrl:]]/',
@@ -57,7 +57,7 @@ public function testCorrectlyAddOptionToSelectElementIfParameterIsAString(Integr
 
         $element->addOption('value');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<select id="test-select" name="test-select"><option value="0">value</option></select>',
             preg_replace(
                 '/[[:cntrl:]]/',
diff --git a/tests/integration/Forms/Element/Select/AddValidatorCest.php b/tests/integration/Forms/Element/Select/AddValidatorCest.php
deleted file mode 100644
index 3b6b2ba63fc..00000000000
--- a/tests/integration/Forms/Element/Select/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/AddValidatorsCest.php b/tests/integration/Forms/Element/Select/AddValidatorsCest.php
deleted file mode 100644
index 9c0ed0f3bcb..00000000000
--- a/tests/integration/Forms/Element/Select/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/AppendMessageCest.php b/tests/integration/Forms/Element/Select/AppendMessageCest.php
deleted file mode 100644
index 180ee7f2938..00000000000
--- a/tests/integration/Forms/Element/Select/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetAttributeCest.php b/tests/integration/Forms/Element/Select/GetAttributeCest.php
deleted file mode 100644
index 21bb82b2d7c..00000000000
--- a/tests/integration/Forms/Element/Select/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetAttributesCest.php b/tests/integration/Forms/Element/Select/GetAttributesCest.php
deleted file mode 100644
index dec998bb19e..00000000000
--- a/tests/integration/Forms/Element/Select/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetDefaultCest.php b/tests/integration/Forms/Element/Select/GetDefaultCest.php
deleted file mode 100644
index 34ddb6804fa..00000000000
--- a/tests/integration/Forms/Element/Select/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetFiltersCest.php b/tests/integration/Forms/Element/Select/GetFiltersCest.php
deleted file mode 100644
index e1aa6e6105b..00000000000
--- a/tests/integration/Forms/Element/Select/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetLabelCest.php b/tests/integration/Forms/Element/Select/GetLabelCest.php
deleted file mode 100644
index 2c03e02f67b..00000000000
--- a/tests/integration/Forms/Element/Select/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetMessagesCest.php b/tests/integration/Forms/Element/Select/GetMessagesCest.php
deleted file mode 100644
index 551f26cea0a..00000000000
--- a/tests/integration/Forms/Element/Select/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetSetAttributeCest.php b/tests/integration/Forms/Element/Select/GetSetAttributeCest.php
new file mode 100644
index 00000000000..adc5bb408d1
--- /dev/null
+++ b/tests/integration/Forms/Element/Select/GetSetAttributeCest.php
@@ -0,0 +1,94 @@
+<?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\Integration\Forms\Element\Select;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function uniqid;
+
+class GetSetAttributeCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\Select :: getAttribute()/setAttribute()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementSelectGetSetAttribute(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\Select - getAttribute()/setAttribute() - ' . $example[0]);
+        $I->skipTest('Todo');
+        $name  = uniqid();
+        $data = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $expected = 'fallback';
+        $actual   = $object->getAttribute('one', 'fallback');
+        $I->assertSame($expected, $actual);
+
+        $object = new $class($name, $data);
+
+        $expected = 'two';
+        $actual   = $object->getAttribute('one', 'fallback');
+        $I->assertSame($expected, $actual);
+
+        $object->setAttribute('one', 'four');
+
+        $expected = 'four';
+        $actual   = $object->getAttribute('one', 'fallback');
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/Select/GetSetAttributesCest.php b/tests/integration/Forms/Element/Select/GetSetAttributesCest.php
new file mode 100644
index 00000000000..dd32f4b106b
--- /dev/null
+++ b/tests/integration/Forms/Element/Select/GetSetAttributesCest.php
@@ -0,0 +1,96 @@
+<?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\Integration\Forms\Element\Select;
+
+use Codeception\Example;
+use IntegrationTester;
+use Phalcon\Forms\Element\Check;
+use Phalcon\Forms\Element\Date;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\File;
+use Phalcon\Forms\Element\Hidden;
+use Phalcon\Forms\Element\Numeric;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Forms\Element\Radio;
+use Phalcon\Forms\Element\Submit;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\TextArea;
+
+use function array_flip;
+use function uniqid;
+
+class GetSetAttributesCest
+{
+    /**
+     * Tests Phalcon\Forms\Element\Select :: getAttributes()/setAttributes()
+     *
+     * @dataProvider getExamples
+     *
+     * @param IntegrationTester $I
+     * @param Example           $example
+     *
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-12-05
+     */
+    public function formsElementSelectGetSetAttributes(IntegrationTester $I, Example $example)
+    {
+        $I->wantToTest('Forms\Element\Select - getAttributes()/setAttributes() - ' . $example[0]);
+        $I->skipTest('Todo');
+
+        $name   = uniqid();
+        $data  = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+        $flipped = array_flip($data);
+
+        $class  = $example[1];
+        $object = new $class($name);
+
+        $actual = $object->getAttributes();
+        $I->assertNull($actual);
+
+        $object = new $class($name, $data);
+
+        $expected = $data;
+        $actual   = $object->getAttributes();
+        $I->assertSame($expected, $actual);
+
+        $object->setAttributes($flipped);
+
+        $expected = $flipped;
+        $actual   = $object->getAttributes();
+        $I->assertSame($expected, $actual);
+    }
+
+    /**
+     * @return string[][]
+     */
+    private function getExamples(): array
+    {
+        return [
+            ["Check", Check::class],
+            ["Date", Date::class],
+            ["Email", Email::class],
+            ["File", File::class],
+            ["Hidden", Hidden::class],
+            ["Numeric", Numeric::class],
+            ["Password", Password::class],
+            ["Radio", Radio::class],
+            ["Submit", Submit::class],
+            ["Text", Text::class],
+            ["TextArea", TextArea::class],
+        ];
+    }
+}
diff --git a/tests/integration/Forms/Element/Select/GetSetFormCest.php b/tests/integration/Forms/Element/Select/GetSetFormCest.php
deleted file mode 100644
index d7b88ba5707..00000000000
--- a/tests/integration/Forms/Element/Select/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Select;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementSelectGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getForm() / setForm()');
-
-        $address = new Select('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementSelectGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getForm() / setForm()');
-
-        $address = new Select('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetSetNameCest.php b/tests/integration/Forms/Element/Select/GetSetNameCest.php
deleted file mode 100644
index a4dd0189337..00000000000
--- a/tests/integration/Forms/Element/Select/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Select;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementSelectGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getName() / setName()');
-
-        $element = new Select('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetUserOptionCest.php b/tests/integration/Forms/Element/Select/GetUserOptionCest.php
deleted file mode 100644
index b469e97d48b..00000000000
--- a/tests/integration/Forms/Element/Select/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/GetUserOptionsCest.php b/tests/integration/Forms/Element/Select/GetUserOptionsCest.php
deleted file mode 100644
index 694aa3a9380..00000000000
--- a/tests/integration/Forms/Element/Select/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/HasMessagesCest.php b/tests/integration/Forms/Element/Select/HasMessagesCest.php
deleted file mode 100644
index 15f1dc2703e..00000000000
--- a/tests/integration/Forms/Element/Select/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/LabelCest.php b/tests/integration/Forms/Element/Select/LabelCest.php
deleted file mode 100644
index 0b62b96a346..00000000000
--- a/tests/integration/Forms/Element/Select/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetAttributeCest.php b/tests/integration/Forms/Element/Select/SetAttributeCest.php
deleted file mode 100644
index bd7782a42e2..00000000000
--- a/tests/integration/Forms/Element/Select/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetAttributesCest.php b/tests/integration/Forms/Element/Select/SetAttributesCest.php
deleted file mode 100644
index eb50fa0199e..00000000000
--- a/tests/integration/Forms/Element/Select/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetDefaultCest.php b/tests/integration/Forms/Element/Select/SetDefaultCest.php
deleted file mode 100644
index 9a559eb0e45..00000000000
--- a/tests/integration/Forms/Element/Select/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetFiltersCest.php b/tests/integration/Forms/Element/Select/SetFiltersCest.php
deleted file mode 100644
index 0452ce065a4..00000000000
--- a/tests/integration/Forms/Element/Select/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetLabelCest.php b/tests/integration/Forms/Element/Select/SetLabelCest.php
deleted file mode 100644
index 8f4a3ee48fa..00000000000
--- a/tests/integration/Forms/Element/Select/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetMessagesCest.php b/tests/integration/Forms/Element/Select/SetMessagesCest.php
deleted file mode 100644
index ae2e0c52df3..00000000000
--- a/tests/integration/Forms/Element/Select/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetUserOptionCest.php b/tests/integration/Forms/Element/Select/SetUserOptionCest.php
deleted file mode 100644
index b9770b35e5d..00000000000
--- a/tests/integration/Forms/Element/Select/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Select/SetUserOptionsCest.php b/tests/integration/Forms/Element/Select/SetUserOptionsCest.php
deleted file mode 100644
index 7181b68101d..00000000000
--- a/tests/integration/Forms/Element/Select/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Select;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Select :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSelectSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Select - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/AddFilterCest.php b/tests/integration/Forms/Element/Submit/AddFilterCest.php
deleted file mode 100644
index 951fa3dff9b..00000000000
--- a/tests/integration/Forms/Element/Submit/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/AddValidatorCest.php b/tests/integration/Forms/Element/Submit/AddValidatorCest.php
deleted file mode 100644
index 3290cb71f51..00000000000
--- a/tests/integration/Forms/Element/Submit/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/AddValidatorsCest.php b/tests/integration/Forms/Element/Submit/AddValidatorsCest.php
deleted file mode 100644
index 58bddb2f760..00000000000
--- a/tests/integration/Forms/Element/Submit/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/AppendMessageCest.php b/tests/integration/Forms/Element/Submit/AppendMessageCest.php
deleted file mode 100644
index d2ac2fdd018..00000000000
--- a/tests/integration/Forms/Element/Submit/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/ClearCest.php b/tests/integration/Forms/Element/Submit/ClearCest.php
deleted file mode 100644
index c46efa0caa3..00000000000
--- a/tests/integration/Forms/Element/Submit/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/ConstructCest.php b/tests/integration/Forms/Element/Submit/ConstructCest.php
deleted file mode 100644
index 820509cf265..00000000000
--- a/tests/integration/Forms/Element/Submit/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetAttributeCest.php b/tests/integration/Forms/Element/Submit/GetAttributeCest.php
deleted file mode 100644
index 8729909801c..00000000000
--- a/tests/integration/Forms/Element/Submit/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetAttributesCest.php b/tests/integration/Forms/Element/Submit/GetAttributesCest.php
deleted file mode 100644
index 11f488771e5..00000000000
--- a/tests/integration/Forms/Element/Submit/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetDefaultCest.php b/tests/integration/Forms/Element/Submit/GetDefaultCest.php
deleted file mode 100644
index d7e174559cf..00000000000
--- a/tests/integration/Forms/Element/Submit/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetFiltersCest.php b/tests/integration/Forms/Element/Submit/GetFiltersCest.php
deleted file mode 100644
index a3dd2bd7918..00000000000
--- a/tests/integration/Forms/Element/Submit/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetLabelCest.php b/tests/integration/Forms/Element/Submit/GetLabelCest.php
deleted file mode 100644
index 6a6782080ba..00000000000
--- a/tests/integration/Forms/Element/Submit/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetMessagesCest.php b/tests/integration/Forms/Element/Submit/GetMessagesCest.php
deleted file mode 100644
index 93958c1a408..00000000000
--- a/tests/integration/Forms/Element/Submit/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetSetFormCest.php b/tests/integration/Forms/Element/Submit/GetSetFormCest.php
deleted file mode 100644
index 90a2c38dd3b..00000000000
--- a/tests/integration/Forms/Element/Submit/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Submit;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementSubmitGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getForm() / setForm()');
-
-        $address = new Submit('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementSubmitGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getForm() / setForm()');
-
-        $address = new Submit('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetSetNameCest.php b/tests/integration/Forms/Element/Submit/GetSetNameCest.php
deleted file mode 100644
index 608c2f6dbab..00000000000
--- a/tests/integration/Forms/Element/Submit/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Submit;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementSubmitGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getName() / setName()');
-
-        $element = new Submit('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetUserOptionCest.php b/tests/integration/Forms/Element/Submit/GetUserOptionCest.php
deleted file mode 100644
index f88980d08d1..00000000000
--- a/tests/integration/Forms/Element/Submit/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php b/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php
deleted file mode 100644
index c32c3a8aa5b..00000000000
--- a/tests/integration/Forms/Element/Submit/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetValidatorsCest.php b/tests/integration/Forms/Element/Submit/GetValidatorsCest.php
deleted file mode 100644
index cdeb2f45b9e..00000000000
--- a/tests/integration/Forms/Element/Submit/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/GetValueCest.php b/tests/integration/Forms/Element/Submit/GetValueCest.php
deleted file mode 100644
index f00f7da1f3d..00000000000
--- a/tests/integration/Forms/Element/Submit/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/HasMessagesCest.php b/tests/integration/Forms/Element/Submit/HasMessagesCest.php
deleted file mode 100644
index 2b8b4422adb..00000000000
--- a/tests/integration/Forms/Element/Submit/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/LabelCest.php b/tests/integration/Forms/Element/Submit/LabelCest.php
deleted file mode 100644
index 92ec011fc7c..00000000000
--- a/tests/integration/Forms/Element/Submit/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/RenderCest.php b/tests/integration/Forms/Element/Submit/RenderCest.php
index 34cdf9f7044..3fbc6db55d5 100644
--- a/tests/integration/Forms/Element/Submit/RenderCest.php
+++ b/tests/integration/Forms/Element/Submit/RenderCest.php
@@ -45,7 +45,7 @@ public function formsElementSubmitRenderSimple(IntegrationTester $I)
 
         $element = new Submit('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="submit" value="simple" />',
             $element->render()
         );
@@ -72,7 +72,7 @@ public function formsElementSubmitRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="submit" value="fantastic" class="fancy" />',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/Submit/SetAttributeCest.php b/tests/integration/Forms/Element/Submit/SetAttributeCest.php
deleted file mode 100644
index 61be9b00a97..00000000000
--- a/tests/integration/Forms/Element/Submit/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetAttributesCest.php b/tests/integration/Forms/Element/Submit/SetAttributesCest.php
deleted file mode 100644
index c6b787fe514..00000000000
--- a/tests/integration/Forms/Element/Submit/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetDefaultCest.php b/tests/integration/Forms/Element/Submit/SetDefaultCest.php
deleted file mode 100644
index a6391a17d8f..00000000000
--- a/tests/integration/Forms/Element/Submit/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetFiltersCest.php b/tests/integration/Forms/Element/Submit/SetFiltersCest.php
deleted file mode 100644
index c172f2c68c1..00000000000
--- a/tests/integration/Forms/Element/Submit/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetLabelCest.php b/tests/integration/Forms/Element/Submit/SetLabelCest.php
deleted file mode 100644
index 40422858043..00000000000
--- a/tests/integration/Forms/Element/Submit/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetMessagesCest.php b/tests/integration/Forms/Element/Submit/SetMessagesCest.php
deleted file mode 100644
index 7970f426da6..00000000000
--- a/tests/integration/Forms/Element/Submit/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetUserOptionCest.php b/tests/integration/Forms/Element/Submit/SetUserOptionCest.php
deleted file mode 100644
index f00951d0d5b..00000000000
--- a/tests/integration/Forms/Element/Submit/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php b/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php
deleted file mode 100644
index cb65137b454..00000000000
--- a/tests/integration/Forms/Element/Submit/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Submit;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Submit :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementSubmitSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Submit - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Submit/ToStringCest.php b/tests/integration/Forms/Element/Submit/ToStringCest.php
index 4837e013cce..86934349668 100644
--- a/tests/integration/Forms/Element/Submit/ToStringCest.php
+++ b/tests/integration/Forms/Element/Submit/ToStringCest.php
@@ -45,7 +45,7 @@ public function formsElementSubmitToStringSimple(IntegrationTester $I)
 
         $element = new Submit('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="submit" value="simple" />',
             $element->__toString()
         );
@@ -72,7 +72,7 @@ public function formsElementSubmitToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="submit" value="fantastic" class="fancy" />',
             $element->__toString()
         );
diff --git a/tests/integration/Forms/Element/Text/AddFilterCest.php b/tests/integration/Forms/Element/Text/AddFilterCest.php
deleted file mode 100644
index a5e7612d1b9..00000000000
--- a/tests/integration/Forms/Element/Text/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/AddValidatorCest.php b/tests/integration/Forms/Element/Text/AddValidatorCest.php
deleted file mode 100644
index 3143eba3155..00000000000
--- a/tests/integration/Forms/Element/Text/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/AddValidatorsCest.php b/tests/integration/Forms/Element/Text/AddValidatorsCest.php
deleted file mode 100644
index 27f519d2e36..00000000000
--- a/tests/integration/Forms/Element/Text/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/AppendMessageCest.php b/tests/integration/Forms/Element/Text/AppendMessageCest.php
deleted file mode 100644
index 8fda904cb22..00000000000
--- a/tests/integration/Forms/Element/Text/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/ClearCest.php b/tests/integration/Forms/Element/Text/ClearCest.php
deleted file mode 100644
index 6304e3ec38e..00000000000
--- a/tests/integration/Forms/Element/Text/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/ConstructCest.php b/tests/integration/Forms/Element/Text/ConstructCest.php
deleted file mode 100644
index 16a76dc343b..00000000000
--- a/tests/integration/Forms/Element/Text/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetAttributeCest.php b/tests/integration/Forms/Element/Text/GetAttributeCest.php
deleted file mode 100644
index 1714c67e107..00000000000
--- a/tests/integration/Forms/Element/Text/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetAttributesCest.php b/tests/integration/Forms/Element/Text/GetAttributesCest.php
deleted file mode 100644
index 4f53810ab49..00000000000
--- a/tests/integration/Forms/Element/Text/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetDefaultCest.php b/tests/integration/Forms/Element/Text/GetDefaultCest.php
deleted file mode 100644
index 83a0771f085..00000000000
--- a/tests/integration/Forms/Element/Text/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetFiltersCest.php b/tests/integration/Forms/Element/Text/GetFiltersCest.php
deleted file mode 100644
index 031c087f195..00000000000
--- a/tests/integration/Forms/Element/Text/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetLabelCest.php b/tests/integration/Forms/Element/Text/GetLabelCest.php
deleted file mode 100644
index 5d01d169967..00000000000
--- a/tests/integration/Forms/Element/Text/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetMessagesCest.php b/tests/integration/Forms/Element/Text/GetMessagesCest.php
deleted file mode 100644
index 7cf762704b0..00000000000
--- a/tests/integration/Forms/Element/Text/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetSetFormCest.php b/tests/integration/Forms/Element/Text/GetSetFormCest.php
deleted file mode 100644
index 007de96ba6d..00000000000
--- a/tests/integration/Forms/Element/Text/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Text;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementTextGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getForm() / setForm()');
-
-        $address = new Text('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementTextGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getForm() / setForm()');
-
-        $address = new Text('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetSetNameCest.php b/tests/integration/Forms/Element/Text/GetSetNameCest.php
deleted file mode 100644
index 808abac3735..00000000000
--- a/tests/integration/Forms/Element/Text/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Text;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementTextGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getName() / setName()');
-
-        $element = new Text('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetUserOptionCest.php b/tests/integration/Forms/Element/Text/GetUserOptionCest.php
deleted file mode 100644
index d8e587824d4..00000000000
--- a/tests/integration/Forms/Element/Text/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetUserOptionsCest.php b/tests/integration/Forms/Element/Text/GetUserOptionsCest.php
deleted file mode 100644
index 2200cf05779..00000000000
--- a/tests/integration/Forms/Element/Text/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetValidatorsCest.php b/tests/integration/Forms/Element/Text/GetValidatorsCest.php
deleted file mode 100644
index 6e8ad26678c..00000000000
--- a/tests/integration/Forms/Element/Text/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/GetValueCest.php b/tests/integration/Forms/Element/Text/GetValueCest.php
deleted file mode 100644
index 2ded191eb11..00000000000
--- a/tests/integration/Forms/Element/Text/GetValueCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class GetValueCest
- */
-class GetValueCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: getValue()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextGetValue(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - getValue()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/HasMessagesCest.php b/tests/integration/Forms/Element/Text/HasMessagesCest.php
deleted file mode 100644
index abc0bc35008..00000000000
--- a/tests/integration/Forms/Element/Text/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/LabelCest.php b/tests/integration/Forms/Element/Text/LabelCest.php
deleted file mode 100644
index fe2a4f60202..00000000000
--- a/tests/integration/Forms/Element/Text/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/RenderCest.php b/tests/integration/Forms/Element/Text/RenderCest.php
index 2a1718f8745..b5a2e9e30fb 100644
--- a/tests/integration/Forms/Element/Text/RenderCest.php
+++ b/tests/integration/Forms/Element/Text/RenderCest.php
@@ -15,31 +15,11 @@
 
 use IntegrationTester;
 use Phalcon\Forms\Element\Text;
-use Phalcon\Tag;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
+use Phalcon\Html\Escaper;
+use Phalcon\Html\TagFactory;
 
 class RenderCest
 {
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * executed after each test
-     */
-    public function _after(IntegrationTester $I)
-    {
-        // Setting the doctype to XHTML5 for other tests to run smoothly
-        Tag::setDocType(
-            Tag::XHTML5
-        );
-    }
-
     /**
      * Tests Phalcon\Forms\Element\Text :: render()
      *
@@ -50,12 +30,13 @@ public function formsElementTextRenderSimple(IntegrationTester $I)
     {
         $I->wantToTest('Forms\Element\Text - render()');
 
+        $factory = new TagFactory(new Escaper());
         $element = new Text('simple');
+        $element->setTagFactory($factory);
 
-        $I->assertEquals(
-            '<input type="text" id="simple" name="simple" />',
-            $element->render()
-        );
+        $expected = '<input type="text" id="simple" name="simple" />';
+        $actual   = $element->render();
+        $I->assertSame($expected, $actual);
     }
 
     /**
@@ -68,6 +49,7 @@ public function formsElementTextRenderWithParameters(IntegrationTester $I)
     {
         $I->wantToTest('Forms\Element\Text - render() with parameters');
 
+        $factory = new TagFactory(new Escaper());
         $element = new Text(
             'fantastic',
             [
@@ -75,10 +57,11 @@ public function formsElementTextRenderWithParameters(IntegrationTester $I)
                 'placeholder' => 'Initial value',
             ]
         );
+        $element->setTagFactory($factory);
 
-        $I->assertEquals(
-            '<input type="text" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
-            $element->render()
-        );
+        $expected = '<input type="text" id="fantastic" name="fantastic" '
+            . 'class="fancy" placeholder="Initial value" />';
+        $actual   = $element->render();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/integration/Forms/Element/Text/SetAttributeCest.php b/tests/integration/Forms/Element/Text/SetAttributeCest.php
deleted file mode 100644
index 9db0d6a5a10..00000000000
--- a/tests/integration/Forms/Element/Text/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetAttributesCest.php b/tests/integration/Forms/Element/Text/SetAttributesCest.php
deleted file mode 100644
index 8b7c2362e17..00000000000
--- a/tests/integration/Forms/Element/Text/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetDefaultCest.php b/tests/integration/Forms/Element/Text/SetDefaultCest.php
deleted file mode 100644
index 2cbf3ba7507..00000000000
--- a/tests/integration/Forms/Element/Text/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetFiltersCest.php b/tests/integration/Forms/Element/Text/SetFiltersCest.php
deleted file mode 100644
index d6043a77a3f..00000000000
--- a/tests/integration/Forms/Element/Text/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetLabelCest.php b/tests/integration/Forms/Element/Text/SetLabelCest.php
deleted file mode 100644
index 57cdb830583..00000000000
--- a/tests/integration/Forms/Element/Text/SetLabelCest.php
+++ /dev/null
@@ -1,63 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\Text;
-use Phalcon\Tag;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class SetLabelCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * executed after each test
-     */
-    public function _after(IntegrationTester $I)
-    {
-        // Setting the doctype to XHTML5 for other tests to run smoothly
-        Tag::setDocType(
-            Tag::XHTML5
-        );
-    }
-
-    public function testFormElementEmpty(IntegrationTester $I)
-    {
-        $element = new Text('name');
-
-        $I->assertNull(
-            $element->getLabel()
-        );
-    }
-
-    public function testIssue1210(IntegrationTester $I)
-    {
-        $element = new Text('test');
-
-        $element->setLabel('Test');
-
-        $I->assertEquals(
-            '<label for="test">Test</label>',
-            $element->label()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetMessagesCest.php b/tests/integration/Forms/Element/Text/SetMessagesCest.php
deleted file mode 100644
index 7d1030f1556..00000000000
--- a/tests/integration/Forms/Element/Text/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetUserOptionCest.php b/tests/integration/Forms/Element/Text/SetUserOptionCest.php
deleted file mode 100644
index 98ad32df732..00000000000
--- a/tests/integration/Forms/Element/Text/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/Text/SetUserOptionsCest.php b/tests/integration/Forms/Element/Text/SetUserOptionsCest.php
deleted file mode 100644
index 9aa0f3c63cd..00000000000
--- a/tests/integration/Forms/Element/Text/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\Text;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\Text :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\Text - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextCest.php b/tests/integration/Forms/Element/Text/TextCest.php
similarity index 91%
rename from tests/integration/Forms/Element/TextCest.php
rename to tests/integration/Forms/Element/Text/TextCest.php
index 0e76167aaf5..d65079f1d01 100644
--- a/tests/integration/Forms/Element/TextCest.php
+++ b/tests/integration/Forms/Element/Text/TextCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Forms\Element;
+namespace Phalcon\Tests\Integration\Forms\Element\Text;
 
 use Codeception\Example;
 use IntegrationTester;
@@ -55,7 +55,7 @@ public function testCreatingTextElementWithNameSimilarToTheFormMethods(Integrati
         $element = new Text($name);
 
 
-        $I->assertEquals(
+        $I->assertSame(
             $name,
             $element->getName()
         );
@@ -67,7 +67,7 @@ public function testCreatingTextElementWithNameSimilarToTheFormMethods(Integrati
             $name
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             $expected,
             $element->render()
         );
@@ -89,7 +89,7 @@ public function testIssue2045(IntegrationTester $I)
 
         $element->setAttribute('id', null);
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="text" name="name" class="big-input" />',
             $element->render()
         );
@@ -112,14 +112,14 @@ public function testPrepareAttributesNoDefault(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals($expected, $actual);
+        $I->assertSame($expected, $actual);
     }
 
     public function testFormElementEmpty(IntegrationTester $I)
     {
         $element = new Text('name');
 
-        $I->assertEquals(
+        $I->assertSame(
             [],
             $element->getAttributes()
         );
@@ -140,7 +140,7 @@ public function testFormElement(IntegrationTester $I)
         $element->setAttribute('placeholder', 'Type the name');
 
 
-        $I->assertEquals(
+        $I->assertSame(
             'name',
             $element->getLabel()
         );
@@ -151,23 +151,23 @@ public function testFormElement(IntegrationTester $I)
             'placeholder' => 'Type the name',
         ];
 
-        $I->assertEquals(
+        $I->assertSame(
             $expected,
             $element->getAttributes()
         );
 
 
-        $I->assertEquals(
+        $I->assertSame(
             'big-input',
             $element->getAttribute('class')
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             'Type the name',
             $element->getAttribute('placeholder', 'the name')
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             'en',
             $element->getAttribute('lang', 'en')
         );
@@ -175,7 +175,7 @@ public function testFormElement(IntegrationTester $I)
 
         $element->setLabel(0);
 
-        $I->assertEquals(
+        $I->assertSame(
             '<label for="name">0</label>',
             $element->label()
         );
@@ -189,7 +189,7 @@ public function testFormPrepareAttributes(IntegrationTester $I)
 
         $expected = ['name'];
 
-        $I->assertEquals(
+        $I->assertSame(
             $expected,
             $element1->prepareAttributes()
         );
@@ -212,7 +212,7 @@ public function testFormPrepareAttributesDefault(IntegrationTester $I)
             'class' => 'big-input',
         ];
 
-        $I->assertEquals(
+        $I->assertSame(
             $expected,
             $element1->prepareAttributes()
         );
@@ -234,13 +234,13 @@ public function testFormOptions(IntegrationTester $I)
 
         $element1->setUserOptions($options);
 
-        $I->assertEquals(
+        $I->assertSame(
             $options,
             $element1->getUserOptions()
         );
 
 
-        $I->assertEquals(
+        $I->assertSame(
             'value',
             $element1->getUserOption('some')
         );
@@ -249,7 +249,7 @@ public function testFormOptions(IntegrationTester $I)
             $element1->getUserOption('some-non')
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             'default',
             $element1->getUserOption('some-non', 'default')
         );
diff --git a/tests/integration/Forms/Element/Text/ToStringCest.php b/tests/integration/Forms/Element/Text/ToStringCest.php
index c84d7342527..6888312be8c 100644
--- a/tests/integration/Forms/Element/Text/ToStringCest.php
+++ b/tests/integration/Forms/Element/Text/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementTextToStringSimple(IntegrationTester $I)
 
         $element = new Text('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="text" id="simple" name="simple" />',
             (string) $element
         );
@@ -76,7 +76,7 @@ public function formsElementTextToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<input type="text" id="fantastic" name="fantastic" class="fancy" placeholder="Initial value" />',
             (string) $element
         );
diff --git a/tests/integration/Forms/Element/TextArea/AddFilterCest.php b/tests/integration/Forms/Element/TextArea/AddFilterCest.php
deleted file mode 100644
index 8df90cc30ac..00000000000
--- a/tests/integration/Forms/Element/TextArea/AddFilterCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class AddFilterCest
- */
-class AddFilterCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: addFilter()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaAddFilter(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - addFilter()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/AddValidatorCest.php b/tests/integration/Forms/Element/TextArea/AddValidatorCest.php
deleted file mode 100644
index 7597fecc1d7..00000000000
--- a/tests/integration/Forms/Element/TextArea/AddValidatorCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorCest
- */
-class AddValidatorCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: addValidator()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaAddValidator(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - addValidator()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php b/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php
deleted file mode 100644
index d31e7d0d735..00000000000
--- a/tests/integration/Forms/Element/TextArea/AddValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class AddValidatorsCest
- */
-class AddValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: addValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaAddValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - addValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/AppendMessageCest.php b/tests/integration/Forms/Element/TextArea/AppendMessageCest.php
deleted file mode 100644
index 52b4b1d8f31..00000000000
--- a/tests/integration/Forms/Element/TextArea/AppendMessageCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class AppendMessageCest
- */
-class AppendMessageCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: appendMessage()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaAppendMessage(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - appendMessage()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/ClearCest.php b/tests/integration/Forms/Element/TextArea/ClearCest.php
deleted file mode 100644
index e3159b3cd9e..00000000000
--- a/tests/integration/Forms/Element/TextArea/ClearCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class ClearCest
- */
-class ClearCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: clear()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaClear(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - clear()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/ConstructCest.php b/tests/integration/Forms/Element/TextArea/ConstructCest.php
deleted file mode 100644
index 39bb2ed18ec..00000000000
--- a/tests/integration/Forms/Element/TextArea/ConstructCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class ConstructCest
- */
-class ConstructCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: __construct()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaConstruct(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - __construct()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetAttributeCest.php b/tests/integration/Forms/Element/TextArea/GetAttributeCest.php
deleted file mode 100644
index 9b9dacd9c94..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributeCest
- */
-class GetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetAttributesCest.php b/tests/integration/Forms/Element/TextArea/GetAttributesCest.php
deleted file mode 100644
index ca1a16729bc..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetAttributesCest
- */
-class GetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetDefaultCest.php b/tests/integration/Forms/Element/TextArea/GetDefaultCest.php
deleted file mode 100644
index 657c16f60bd..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetDefaultCest
- */
-class GetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetFiltersCest.php b/tests/integration/Forms/Element/TextArea/GetFiltersCest.php
deleted file mode 100644
index 9bf683fc138..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetFiltersCest
- */
-class GetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetLabelCest.php b/tests/integration/Forms/Element/TextArea/GetLabelCest.php
deleted file mode 100644
index a11a65aae10..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetLabelCest
- */
-class GetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetMessagesCest.php b/tests/integration/Forms/Element/TextArea/GetMessagesCest.php
deleted file mode 100644
index 4483ace79d0..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetMessagesCest
- */
-class GetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetSetFormCest.php b/tests/integration/Forms/Element/TextArea/GetSetFormCest.php
deleted file mode 100644
index eaae4d43e4e..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetSetFormCest.php
+++ /dev/null
@@ -1,65 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\TextArea;
-use Phalcon\Forms\Form;
-
-class GetSetFormCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementTextAreaGetSetForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getForm() / setForm()');
-
-        $address = new TextArea('address');
-
-        $form = new Form();
-
-        $address->setForm($form);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getForm() / setForm()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-04-25
-     */
-    public function formsElementTextAreaGetSetFormViaForm(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getForm() / setForm()');
-
-        $address = new TextArea('address');
-
-        $form = new Form();
-
-        $form->add($address);
-
-        $I->assertSame(
-            $form,
-            $address->getForm()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetSetNameCest.php b/tests/integration/Forms/Element/TextArea/GetSetNameCest.php
deleted file mode 100644
index 4367459a039..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetSetNameCest.php
+++ /dev/null
@@ -1,55 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-use Phalcon\Forms\Element\TextArea;
-use Phalcon\Tests\Fixtures\Traits\DiTrait;
-
-class GetSetNameCest
-{
-    use DiTrait;
-
-    public function _before(IntegrationTester $I)
-    {
-        $this->newDi();
-        $this->setDiService('escaper');
-        $this->setDiService('url');
-    }
-
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getName() / setName()
-     *
-     * @author Sid Roberts <https://github.com/SidRoberts>
-     * @since  2019-06-02
-     */
-    public function formsElementTextAreaGetSetName(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getName() / setName()');
-
-        $element = new TextArea('simple');
-
-        $I->assertEquals(
-            'simple',
-            $element->getName()
-        );
-
-        $element->setName('different');
-
-        $I->assertEquals(
-            'different',
-            $element->getName()
-        );
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php b/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php
deleted file mode 100644
index 2c52cf40956..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionCest
- */
-class GetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php b/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php
deleted file mode 100644
index 9c78df5f168..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetUserOptionsCest
- */
-class GetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php b/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php
deleted file mode 100644
index 7cf0761f61a..00000000000
--- a/tests/integration/Forms/Element/TextArea/GetValidatorsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class GetValidatorsCest
- */
-class GetValidatorsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: getValidators()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaGetValidators(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - getValidators()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/HasMessagesCest.php b/tests/integration/Forms/Element/TextArea/HasMessagesCest.php
deleted file mode 100644
index dd82efe7911..00000000000
--- a/tests/integration/Forms/Element/TextArea/HasMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class HasMessagesCest
- */
-class HasMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: hasMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaHasMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - hasMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/LabelCest.php b/tests/integration/Forms/Element/TextArea/LabelCest.php
deleted file mode 100644
index b18b5608115..00000000000
--- a/tests/integration/Forms/Element/TextArea/LabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class LabelCest
- */
-class LabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: label()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - label()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/RenderCest.php b/tests/integration/Forms/Element/TextArea/RenderCest.php
index d1be86c6d69..d19d0fc0856 100644
--- a/tests/integration/Forms/Element/TextArea/RenderCest.php
+++ b/tests/integration/Forms/Element/TextArea/RenderCest.php
@@ -52,7 +52,7 @@ public function formsElementTextareaRenderSimple(IntegrationTester $I)
 
         $element = new Textarea('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<textarea id="simple" name="simple"></textarea>',
             $element->render()
         );
@@ -76,7 +76,7 @@ public function formsElementTextareaRenderWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<textarea id="fantastic" name="fantastic" class="fancy" placeholder="Initial value"></textarea>',
             $element->render()
         );
diff --git a/tests/integration/Forms/Element/TextArea/SetAttributeCest.php b/tests/integration/Forms/Element/TextArea/SetAttributeCest.php
deleted file mode 100644
index ecd02ae7933..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetAttributeCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributeCest
- */
-class SetAttributeCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setAttribute()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetAttribute(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setAttribute()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetAttributesCest.php b/tests/integration/Forms/Element/TextArea/SetAttributesCest.php
deleted file mode 100644
index 175f0bb67f4..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetAttributesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetAttributesCest
- */
-class SetAttributesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setAttributes()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetAttributes(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setAttributes()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetDefaultCest.php b/tests/integration/Forms/Element/TextArea/SetDefaultCest.php
deleted file mode 100644
index b970069c2bc..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetDefaultCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetDefaultCest
- */
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetDefault(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setDefault()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetFiltersCest.php b/tests/integration/Forms/Element/TextArea/SetFiltersCest.php
deleted file mode 100644
index bd70687fde4..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetFiltersCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetFiltersCest
- */
-class SetFiltersCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setFilters()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetFilters(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setFilters()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetLabelCest.php b/tests/integration/Forms/Element/TextArea/SetLabelCest.php
deleted file mode 100644
index 5f8ff363988..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetLabelCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetLabelCest
- */
-class SetLabelCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setLabel()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetLabel(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setLabel()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetMessagesCest.php b/tests/integration/Forms/Element/TextArea/SetMessagesCest.php
deleted file mode 100644
index c7dd27b562e..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetMessagesCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetMessagesCest
- */
-class SetMessagesCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setMessages()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetMessages(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setMessages()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php b/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php
deleted file mode 100644
index f4159f0b1a4..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetUserOptionCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionCest
- */
-class SetUserOptionCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setUserOption()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetUserOption(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setUserOption()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php b/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php
deleted file mode 100644
index c3275094c7c..00000000000
--- a/tests/integration/Forms/Element/TextArea/SetUserOptionsCest.php
+++ /dev/null
@@ -1,34 +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\Tests\Integration\Forms\Element\TextArea;
-
-use IntegrationTester;
-
-/**
- * Class SetUserOptionsCest
- */
-class SetUserOptionsCest
-{
-    /**
-     * Tests Phalcon\Forms\Element\TextArea :: setUserOptions()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function formsElementTextareaSetUserOptions(IntegrationTester $I)
-    {
-        $I->wantToTest('Forms\Element\TextArea - setUserOptions()');
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Forms/Element/TextArea/ToStringCest.php b/tests/integration/Forms/Element/TextArea/ToStringCest.php
index 52046843560..e1aa06f1ff3 100644
--- a/tests/integration/Forms/Element/TextArea/ToStringCest.php
+++ b/tests/integration/Forms/Element/TextArea/ToStringCest.php
@@ -52,7 +52,7 @@ public function formsElementTextareaToStringSimple(IntegrationTester $I)
 
         $element = new Textarea('simple');
 
-        $I->assertEquals(
+        $I->assertSame(
             '<textarea id="simple" name="simple"></textarea>',
             (string) $element
         );
@@ -76,7 +76,7 @@ public function formsElementTextareaToStringWithParameters(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
+        $I->assertSame(
             '<textarea id="fantastic" name="fantastic" class="fancy" placeholder="Initial value"></textarea>',
             (string) $element
         );
diff --git a/tests/unit/Html/Escaper/CssCest.php b/tests/unit/Html/Escaper/CssCest.php
index 40945642087..fb25ed75359 100644
--- a/tests/unit/Html/Escaper/CssCest.php
+++ b/tests/unit/Html/Escaper/CssCest.php
@@ -29,7 +29,6 @@ class CssCest
     public function escaperCss(UnitTester $I)
     {
         $I->wantToTest('Escaper - css()');
-        $I->skipTest("TODO: Enable this after escaping is converted from C to PHP");
 
         $escaper = new Escaper();
 
diff --git a/tests/unit/Html/Escaper/GetSetFlagsCest.php b/tests/unit/Html/Escaper/GetSetFlagsCest.php
index 50d56d635a9..ebf07584482 100644
--- a/tests/unit/Html/Escaper/GetSetFlagsCest.php
+++ b/tests/unit/Html/Escaper/GetSetFlagsCest.php
@@ -16,6 +16,10 @@
 use Phalcon\Html\Escaper;
 use UnitTester;
 
+use const ENT_HTML401;
+use const ENT_QUOTES;
+use const ENT_SUBSTITUTE;
+
 /**
  * Class GetSetFlagsCest
  *
@@ -37,8 +41,16 @@ public function escaperGetSetFlags(UnitTester $I)
 
         $escaper = new Escaper();
 
+        $expected = ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401;
+        $actual   = $escaper->getFlags();
+        $I->assertEquals($expected, $actual);
+
         $escaper->setFlags(ENT_HTML401);
 
+        $expected = ENT_HTML401;
+        $actual   = $escaper->getFlags();
+        $I->assertEquals($expected, $actual);
+
         $expected = 'That&#039;s right';
         $actual   = $escaper->attributes("That's right");
         $I->assertEquals($expected, $actual);
diff --git a/tests/unit/Html/Escaper/JsCest.php b/tests/unit/Html/Escaper/JsCest.php
index b9389b1dba1..ba77827e5dc 100644
--- a/tests/unit/Html/Escaper/JsCest.php
+++ b/tests/unit/Html/Escaper/JsCest.php
@@ -29,7 +29,7 @@ class JsCest
     public function escaperJs(UnitTester $I)
     {
         $I->wantToTest('Escaper - js()');
-        $I->skipTest("TODO: Enable this after escaping is converted from C to PHP");
+
         $escaper = new Escaper();
 
         $source = 'function createtoc () {'
diff --git a/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php
index e448ba09b94..f71e96e32ca 100644
--- a/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Label/UnderscoreInvokeCest.php
@@ -18,6 +18,8 @@
 use Phalcon\Html\TagFactory;
 use UnitTester;
 
+use function uniqid;
+
 /**
  * Class UnderscoreInvokeCest
  *
@@ -40,18 +42,18 @@ class UnderscoreInvokeCest
      */
     public function htmlHelperLabelUnderscoreInvoke(UnitTester $I, Example $example)
     {
-        $I->wantToTest('Html\Helper\Label - __invoke()');
+        $I->wantToTest('Html\Helper\Label - __invoke() - ' . $example[0]);
         $escaper = new Escaper();
         $helper  = new Label($escaper);
 
-        $expected = $example[0];
-        $actual   = $helper($example[1]);
+        $expected = $example[1];
+        $actual   = $helper($example[2], $example[3], $example[4]);
         $I->assertEquals($expected, $actual);
 
         $factory  = new TagFactory($escaper);
         $locator  = $factory->newInstance('label');
-        $expected = $example[0];
-        $actual   = $locator($example[1]);
+        $expected = $example[1];
+        $actual   = $locator($example[2], $example[3], $example[4]);
         $I->assertEquals($expected, $actual);
     }
 
@@ -60,25 +62,45 @@ public function htmlHelperLabelUnderscoreInvoke(UnitTester $I, Example $example)
      */
     private function getExamples(): array
     {
+        $text = uniqid();
         return [
             [
-                '<label>',
+                'empty',
+                '<label></label>',
+                '',
                 [],
+                false,
             ],
             [
-                '<label for="my-name" id="my-id">',
+                'standard',
+                '<label for="my-name" id="my-id">' . $text . '&amp;' . $text . '</label>',
+                $text . '&' . $text,
                 [
                     'id'  => 'my-id',
                     'for' => 'my-name',
                 ],
+                false,
             ],
             [
-                '<label for="my-name" id="my-id" class="my-class">',
+                'with id',
+                '<label for="my-name" id="my-id" class="my-class">' . $text . '&amp;' . $text . '</label>',
+                $text . '&' . $text,
                 [
                     'class' => 'my-class',
                     'for'   => 'my-name',
                     'id'    => 'my-id',
                 ],
+                false,
+            ],
+            [
+                'raw',
+                '<label for="my-name" id="my-id">raw & text</label>',
+                'raw & text',
+                [
+                    'id'  => 'my-id',
+                    'for' => 'my-name',
+                ],
+                true,
             ],
         ];
     }
diff --git a/tests/unit/Html/TagFactory/NewInstanceCest.php b/tests/unit/Html/TagFactory/NewInstanceCest.php
index 1e975231e55..78e504d3c98 100644
--- a/tests/unit/Html/TagFactory/NewInstanceCest.php
+++ b/tests/unit/Html/TagFactory/NewInstanceCest.php
@@ -57,6 +57,8 @@
 use Phalcon\Html\TagFactory;
 use UnitTester;
 
+use function uniqid;
+
 /**
  * Class NewInstanceCest
  *
@@ -99,12 +101,22 @@ public function filterTagFactoryNewInstanceException(UnitTester $I)
     {
         $I->wantToTest('Helper\TagFactory - newInstance() - exception');
 
+        $name = uniqid();
+        $I->expectThrowable(
+            new Exception('Service ' . $name . ' is not registered'),
+            function () use ($name) {
+                $escaper = new Escaper();
+                $factory = new TagFactory($escaper);
+                $service = $factory->newInstance($name);
+            }
+        );
+
         $I->expectThrowable(
-            new Exception('Service unknown is not registered'),
-            function () {
+            new Exception('Service ' . $name . ' is not registered'),
+            function () use ($name) {
                 $escaper = new Escaper();
                 $factory = new TagFactory($escaper);
-                $service = $factory->newInstance('unknown');
+                $service = $factory->$name();
             }
         );
     }