diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index c50d7497862..c35e1f77cfd 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -26,6 +26,7 @@ Yii Framework 2 Change Log
 - Chg #20464: Remove `PHP_VERSION_ID` checks from web `Response` class (terabytesoftw)
 - Enh #20511: Allow `jQuery` usage in `View` class while maintaining backward compatibility (terabytesoftw)
 - Bug #20518: `PHP` 8.4 fixes for implicit nullability deprecation (terabytesoftw)
+- Enh #20537: Enhance `label()` method in `ActiveField` with `tag` option and fix `labelOptions` for `checkbox`/`radio` (terabytesoftw)
 - Bug #20547: `PHP` 8.4 fixes for implicit nullability deprecation (terabytesoftw)
 
 2.0.54 under development
diff --git a/framework/UPGRADE.md b/framework/UPGRADE.md
index 6d63bd70af4..fb97683d97e 100644
--- a/framework/UPGRADE.md
+++ b/framework/UPGRADE.md
@@ -51,6 +51,24 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to follow the instructions
 for both A and B.
 
+Upgrade from Yii 2.0.x
+-----------------------
+
+* Raised minimum supported PHP version to `8.1`.
+* All methods that were previously deprecated have been removed. If your application still uses any deprecated methods,
+  you must update your code before upgrading.
+* Support for CUBRID database has been removed.
+* `yii\widgets\ActiveField::label()` method now supports a `tag` option to control the wrapper element. This provides
+  flexibility for custom label rendering while maintaining full backward compatibility:
+  - `tag => 'label'` default generates standard `<label>` element with `for` attribute.
+  - `tag => false`  renders label content without any wrapper tag.
+  - `tag => 'span'/'div'/etc` uses specified HTML element as wrapper.
+  
+Example usage:
+
+```php
+  $field->label('My Label', ['tag' => 'span', 'class' => 'custom-label']);
+```
 Upgrade from Yii 2.0.53
 -----------------------
 
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index c117b717318..08f026b52fc 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -264,8 +264,18 @@ public function end()
      * If `false`, the generated field will not contain the label part.
      * Note that this will NOT be [[Html::encode()|encoded]].
      * @param array|null $options the tag options in terms of name-value pairs. It will be merged with [[labelOptions]].
-     * The options will be rendered as the attributes of the resulting tag. The values will be HTML-encoded
-     * using [[Html::encode()]]. If a value is `null`, the corresponding attribute will not be rendered.
+     * The options will be rendered as the attributes of the resulting tag. The values will be HTML-encoded using
+     * [[Html::encode()]]. If a value is `null`, the corresponding attribute will not be rendered.
+     * The following special options are recognized:
+     * - `label`: string|false|null, if specified in $options (or previously set in [[labelOptions]]), this value will
+     *   be used when the $label parameter is `null`. If set to `false`, the label will not be rendered (same behavior
+     *   as passing $label = `false`). The $label parameter always takes precedence over this option.
+     * - `tag`: string|false, specifies the tag name for the label element.
+     *   - If not specified, defaults to `'label'`.
+     *   - If set to `false`, the label content will be rendered as raw HTML without any wrapper tag.
+     *   - If set to `'label'`, uses [[Html::activeLabel()]] to generate a standard label element.
+     *   - If set to another tag name (for example, `'span'`, `'div'`), uses [[Html::tag()]] to generate that element.
+     *
      * @return $this the field object itself.
      */
     public function label($label = null, $options = [])
@@ -276,15 +286,35 @@ public function label($label = null, $options = [])
         }
 
         $options = array_merge($this->labelOptions, $options);
-        if ($label !== null) {
-            $options['label'] = $label;
-        }
+        $tag = ArrayHelper::remove($options, 'tag', 'label');
 
-        if ($this->_skipLabelFor) {
-            $options['for'] = null;
+        if ($label === null) {
+            $label = $options['label'] ?? null;
+
+            if ($label === false) {
+                $this->parts['{label}'] = '';
+
+                return $this;
+            }
         }
 
-        $this->parts['{label}'] = Html::activeLabel($this->model, $this->attribute, $options);
+        $label ??= $this->model->getAttributeLabel(Html::getAttributeName($this->attribute));
+
+        $options['label'] = $label;
+
+        if ($tag === false) {
+            $this->parts['{label}'] = $label;
+        } elseif ($tag === 'label') {
+            if ($this->_skipLabelFor) {
+                $options['for'] = null;
+            }
+
+            $this->parts['{label}'] = Html::activeLabel($this->model, $this->attribute, $options);
+        } else {
+            unset($options['label'], $options['for']);
+
+            $this->parts['{label}'] = Html::tag($tag, $label, $options);
+        }
 
         return $this;
     }
@@ -523,11 +553,21 @@ public function textarea($options = [])
      *   it will take the default value `0`. This method will render a hidden input so that if the radio button
      *   is not checked and is submitted, the value of this attribute will still be submitted to the server
      *   via the hidden input. If you do not want any hidden input, you should explicitly set this option as `null`.
-     * - `label`: string, a label displayed next to the radio button. It will NOT be HTML-encoded. Therefore you can pass
-     *   in HTML code such as an image tag. If this is coming from end users, you should [[Html::encode()|encode]] it to prevent XSS attacks.
-     *   When this option is specified, the radio button will be enclosed by a label tag. If you do not want any label, you should
-     *   explicitly set this option as `null`.
-     * - `labelOptions`: array, the HTML attributes for the label tag. This is only used when the `label` option is specified.
+     * - `label`: string|false|null, a label displayed next to the radio.
+     *   - If a string, it will NOT be HTML-encoded. Therefore you can pass in HTML code such as an image tag.
+     *   - If this is coming from end users, you should [[Html::encode()|encode]] it to prevent XSS attacks.
+     *   - If `false`, no label will be rendered.
+     *   - If `null`, no label will be rendered (same as `false`).
+     *   When this option is specified as a string and `enclosedByLabel` is `true`, the radio will be enclosed by a
+     *   label tag.
+     * - `labelOptions`: array, the HTML attributes for the label tag. This is only used when the `label` option is
+     *   specified and `enclosedByLabel` is `false`. The following special option is recognized:
+     *   - `tag`: string|false, specifies the tag name for the label element.
+     *     - If `labelOptions` is not provided, the label content will be rendered as raw HTML without any wrapper tag.
+     *     - If `labelOptions` is provided but `tag` is not specified, defaults to `'label'`.
+     *     - If set to `'label'`, uses [[Html::activeLabel()]] to generate a standard label element.
+     *     - If set to another tag name (for example, `'span'`, `'div'`), uses [[Html::tag()]] to generate that element.
+     *     - If set to `false`, the label content will be rendered as raw HTML without any wrapper tag.
      *
      * The rest of the options will be rendered as the attributes of the resulting tag. The values will
      * be HTML-encoded using [[Html::encode()]]. If a value is `null`, the corresponding attribute will not be rendered.
@@ -548,20 +588,11 @@ public function radio($options = [], $enclosedByLabel = true)
         $this->addAriaAttributes($options);
         $this->adjustLabelFor($options);
 
-        if ($enclosedByLabel) {
-            $this->parts['{input}'] = Html::activeRadio($this->model, $this->attribute, $options);
-            $this->parts['{label}'] = '';
-        } else {
-            if (isset($options['label']) && !isset($this->parts['{label}'])) {
-                $this->parts['{label}'] = $options['label'];
-                if (!empty($options['labelOptions'])) {
-                    $this->labelOptions = $options['labelOptions'];
-                }
-            }
-            unset($options['labelOptions']);
-            $options['label'] = null;
-            $this->parts['{input}'] = Html::activeRadio($this->model, $this->attribute, $options);
-        }
+        $this->parts['{label}'] = '';
+
+        $options = $enclosedByLabel ? $options : $this->generateLabel($options);
+
+        $this->parts['{input}'] = Html::activeRadio($this->model, $this->attribute, $options);
 
         return $this;
     }
@@ -571,15 +602,25 @@ public function radio($options = [], $enclosedByLabel = true)
      * This method will generate the `checked` tag attribute according to the model attribute value.
      * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
      *
-     * - `uncheck`: string, the value associated with the uncheck state of the radio button. If not set,
-     *   it will take the default value `0`. This method will render a hidden input so that if the radio button
+     * - `uncheck`: string, the value associated with the uncheck state of the checkbox. If not set,
+     *   it will take the default value `0`. This method will render a hidden input so that if the checkbox
      *   is not checked and is submitted, the value of this attribute will still be submitted to the server
      *   via the hidden input. If you do not want any hidden input, you should explicitly set this option as `null`.
-     * - `label`: string, a label displayed next to the checkbox. It will NOT be HTML-encoded. Therefore you can pass
-     *   in HTML code such as an image tag. If this is coming from end users, you should [[Html::encode()|encode]] it to prevent XSS attacks.
-     *   When this option is specified, the checkbox will be enclosed by a label tag. If you do not want any label, you should
-     *   explicitly set this option as `null`.
-     * - `labelOptions`: array, the HTML attributes for the label tag. This is only used when the `label` option is specified.
+     * - `label`: string|false|null, a label displayed next to the checkbox.
+     *   - If a string, it will NOT be HTML-encoded. Therefore you can pass in HTML code such as an image tag.
+     *   - If this is coming from end users, you should [[Html::encode()|encode]] it to prevent XSS attacks.
+     *   - If `false`, no label will be rendered.
+     *   - If `null`, no label will be rendered (same as `false`).
+     *   When this option is specified as a string and `enclosedByLabel` is `true`, the checkbox will be enclosed by a
+     *   label tag.
+     * - `labelOptions`: array, the HTML attributes for the label tag. This is only used when the `label` option is
+     *   specified and `enclosedByLabel` is `false`. The following special option is recognized:
+     *   - `tag`: string|false, specifies the tag name for the label element.
+     *     - If `labelOptions` is not provided, the label content will be rendered as raw HTML without any wrapper tag.
+     *     - If `labelOptions` is provided but `tag` is not specified, defaults to `'label'`.
+     *     - If set to `'label'`, uses [[Html::activeLabel()]] to generate a standard label element.
+     *     - If set to another tag name (for example, `'span'`, `'div'`), uses [[Html::tag()]] to generate that element.
+     *     - If set to `false`, the label content will be rendered as raw HTML without any wrapper tag.
      *
      * The rest of the options will be rendered as the attributes of the resulting tag. The values will
      * be HTML-encoded using [[Html::encode()]]. If a value is `null`, the corresponding attribute will not be rendered.
@@ -600,20 +641,11 @@ public function checkbox($options = [], $enclosedByLabel = true)
         $this->addAriaAttributes($options);
         $this->adjustLabelFor($options);
 
-        if ($enclosedByLabel) {
-            $this->parts['{input}'] = Html::activeCheckbox($this->model, $this->attribute, $options);
-            $this->parts['{label}'] = '';
-        } else {
-            if (isset($options['label']) && !isset($this->parts['{label}'])) {
-                $this->parts['{label}'] = $options['label'];
-                if (!empty($options['labelOptions'])) {
-                    $this->labelOptions = $options['labelOptions'];
-                }
-            }
-            unset($options['labelOptions']);
-            $options['label'] = null;
-            $this->parts['{input}'] = Html::activeCheckbox($this->model, $this->attribute, $options);
-        }
+        $this->parts['{label}'] = '';
+
+        $options = $enclosedByLabel ? $options : $this->generateLabel($options);
+
+        $this->parts['{input}'] = Html::activeCheckbox($this->model, $this->attribute, $options);
 
         return $this;
     }
@@ -961,4 +993,44 @@ protected function addErrorClassIfNeeded(&$options)
             Html::addCssClass($options, $this->form->errorCssClass);
         }
     }
+
+    /**
+     * Generates the label element based on `labelOptions` configuration when `enclosedByLabel` is `false`.
+     *
+     * @param array $options the input options array
+     *
+     * @return array the cleaned options array with `labelOptions` removed
+     */
+    protected function generateLabel(array $options): array
+    {
+        if (isset($options['label']) && $options['label'] !== false && $this->parts['{label}'] === '') {
+            $tag = false;
+
+            if (!empty($options['labelOptions'])) {
+                $tag = $options['labelOptions']['tag'] ?? 'label';
+
+                unset($options['labelOptions']['tag']);
+
+                $this->labelOptions = array_merge($this->labelOptions, $options['labelOptions']);
+            }
+
+            if ($tag === false) {
+                $this->parts['{label}'] = $options['label'];
+            } elseif ($tag === 'label') {
+                $this->parts['{label}'] = Html::activeLabel(
+                    $this->model,
+                    $this->attribute,
+                    array_merge(['label' => $options['label']], $this->labelOptions),
+                );
+            } else {
+                $this->parts['{label}'] = Html::tag($tag, $options['label'], $this->labelOptions);
+            }
+        }
+
+        unset($options['labelOptions']);
+
+        $options['label'] = null;
+
+        return $options;
+    }
 }
diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php
index 61cdcdac2ce..63f2687a063 100644
--- a/tests/framework/widgets/ActiveFieldTest.php
+++ b/tests/framework/widgets/ActiveFieldTest.php
@@ -1,10 +1,13 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license https://www.yiiframework.com/license/
  */
 
+declare(strict_types=1);
+
 namespace yiiunit\framework\widgets;
 
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
@@ -64,17 +67,17 @@ protected function setUp(): void
 
     public function testRenderNoContent(): void
     {
-        $expectedValue = <<<EOD
-<div class="form-group field-activefieldtestmodel-attributename">
-<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[{$this->attributeName}]">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[{$this->attributeName}]">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     /**
@@ -84,21 +87,21 @@ public function testRenderWithCallableContent(): void
     {
         // field will be the html of the model's attribute wrapped with the return string below.
         $field = $this->attributeName;
-        $content = fn($field) => "<div class=\"custom-container\"> $field </div>";
-
-        $expectedValue = <<<EOD
-<div class="form-group field-activefieldtestmodel-attributename">
-<div class="custom-container"> <div class="form-group field-activefieldtestmodel-attributename">
-<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[{$this->attributeName}]">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div> </div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render($content);
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $content = static fn (string $field): string => "<div class=\"custom-container\"> $field </div>";
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <div class="custom-container"> <div class="form-group field-activefieldtestmodel-attributename">
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[{$this->attributeName}]">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div> </div>
+            </div>
+            HTML,
+            $this->activeField->render($content),
+        );
     }
 
     /**
@@ -106,39 +109,43 @@ public function testRenderWithCallableContent(): void
      */
     public function testRenderWithCustomInputId(): void
     {
-        $expectedValue = <<<EOD
-<div class="form-group field-custom-input-id">
-<label class="control-label" for="custom-input-id">Attribute Name</label>
-<input type="text" id="custom-input-id" class="form-control" name="ActiveFieldTestModel[{$this->attributeName}]">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
-
         $this->activeField->inputOptions['id'] = 'custom-input-id';
 
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-custom-input-id">
+            <label class="control-label" for="custom-input-id">Attribute Name</label>
+            <input type="text" id="custom-input-id" class="form-control" name="ActiveFieldTestModel[{$this->attributeName}]">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testBeginHasErrors(): void
     {
         $this->helperModel->addError($this->attributeName, 'Error Message');
 
-        $expectedValue = '<div class="form-group field-activefieldtestmodel-attributename has-error">';
-        $actualValue = $this->activeField->begin();
-
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename has-error">
+            HTML,
+            $this->activeField->begin(),
+        );
     }
 
     public function testBeginAttributeIsRequired(): void
     {
         $this->helperModel->addRule($this->attributeName, 'required');
 
-        $expectedValue = '<div class="form-group field-activefieldtestmodel-attributename required">';
-        $actualValue = $this->activeField->begin();
-
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename required">
+            HTML,
+            $this->activeField->begin(),
+        );
     }
 
     public function testBeginHasErrorAndRequired(): void
@@ -146,10 +153,12 @@ public function testBeginHasErrorAndRequired(): void
         $this->helperModel->addError($this->attributeName, 'Error Message');
         $this->helperModel->addRule($this->attributeName, 'required');
 
-        $expectedValue = '<div class="form-group field-activefieldtestmodel-attributename required has-error">';
-        $actualValue = $this->activeField->begin();
-
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename required has-error">
+            HTML,
+            $this->activeField->begin(),
+        );
     }
 
     public function testBegin(): void
@@ -158,19 +167,19 @@ public function testBegin(): void
         $this->activeField->options['tag'] = 'article';
         $actualValue = $this->activeField->begin();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
 
         $expectedValue = '';
         $this->activeField->options['tag'] = null;
         $actualValue = $this->activeField->begin();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
 
         $expectedValue = '';
         $this->activeField->options['tag'] = false;
         $actualValue = $this->activeField->begin();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
     }
 
     public function testEnd(): void
@@ -178,72 +187,268 @@ public function testEnd(): void
         $expectedValue = '</div>';
         $actualValue = $this->activeField->end();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
 
         // other tag
         $expectedValue = '</article>';
         $this->activeField->options['tag'] = 'article';
         $actualValue = $this->activeField->end();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
 
         $expectedValue = '';
         $this->activeField->options['tag'] = false;
         $actualValue = $this->activeField->end();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
 
         $expectedValue = '';
         $this->activeField->options['tag'] = null;
         $actualValue = $this->activeField->end();
 
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertSame($expectedValue, $actualValue);
     }
 
     public function testLabel(): void
     {
-        $expectedValue = '<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>';
         $this->activeField->label();
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{label}']);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
 
-        // label = false
-        $expectedValue = '';
-        $this->activeField->label(false);
+    public function testLabelInheritsLabelOptions(): void
+    {
+        $this->activeField->labelOptions = [
+            'class' => 'inherited-class',
+            'data-test' => 'inherited-data'
+        ];
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{label}']);
+        $this->activeField->label(
+            'Test Label',
+            ['class' => 'override-class'],
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="override-class" data-test="inherited-data" for="activefieldtestmodel-attributename">Test Label</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
 
-        // $label = 'Label Name'
+    public function testLabelPriorityOfContent(): void
+    {
+        $label = 'Parameter Label';
+        $paramLabel = 'Options Label';
+
+        $this->activeField->label($label, ['label' => $paramLabel]);
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">{$label}</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+
+        $this->activeField->label(null, ['label' => $paramLabel]);
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">{$paramLabel}</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+
+        $this->activeField->label();
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
+
+    public function testLabelOptionsLabelFalseWithNullParameter(): void
+    {
+        $this->activeField->labelOptions = ['label' => false];
+
+        $this->activeField->label(null);
+
+        $this->assertEmpty(
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label does not render.',
+        );
+    }
+
+    public function testLabelOptionsLabelFalseWithNoParameters(): void
+    {
+        $this->activeField->labelOptions = ['label' => false];
+
+        $this->activeField->label();
+
+        $this->assertEmpty(
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label does not render.',
+        );
+    }
+
+    public function testLabelOverridesLabelOptionsFalse(): void
+    {
+        $this->activeField->labelOptions = ['label' => false];
+
+        $this->activeField->label('Override Label');
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label for="activefieldtestmodel-attributename">Override Label</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
+
+    public function testLabelWithContent(): void
+    {
         $label = 'Label Name';
-        $expectedValue = <<<EOT
-<label class="control-label" for="activefieldtestmodel-attributename">{$label}</label>
-EOT;
+
         $this->activeField->label($label);
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{label}']);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">{$label}</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
+
+    public function testLabelWithEmptyString(): void
+    {
+        $this->activeField->label('');
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename"></label>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
+
+    public function testLabelWithLabelOptionsAndTagCustom(): void
+    {
+        $label = 'Label Name';
+
+        $this->activeField->label(
+            $label,
+            [
+                'class' => 'custom-class',
+                'tag' => 'h3',
+            ],
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <h3 class="custom-class">{$label}</h3>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+
+        $this->activeField->label(
+            null,
+            [
+                'class' => 'custom-class',
+                'label' => $label,
+                'tag' => 'h3',
+            ],
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <h3 class="custom-class">{$label}</h3>
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+    }
+
+    public function testLabelWithLabelOptionsAndTagFalse(): void
+    {
+        $label = 'Label Name';
+
+        $this->activeField->label(
+            $label,
+            [
+                'class' => 'custom-class',
+                'tag' => false,
+            ],
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            {$label}
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
+
+        $this->activeField->label(
+            null,
+            [
+                'class' => 'custom-class',
+                'label' => $label,
+                'tag' => false,
+            ],
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            {$label}
+            HTML,
+            $this->activeField->parts['{label}'],
+            'Failed asserting that label renders correctly.',
+        );
     }
 
     public function testError(): void
     {
-        $expectedValue = '<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>';
         $this->activeField->label();
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{label}']);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+       );
 
         // label = false
         $expectedValue = '';
         $this->activeField->label(false);
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{label}']);
+        $this->assertSame($expectedValue, $this->activeField->parts['{label}']);
 
         // $label = 'Label Name'
         $label = 'Label Name';
-        $expectedValue = <<<EOT
-<label class="control-label" for="activefieldtestmodel-attributename">{$label}</label>
-EOT;
         $this->activeField->label($label);
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{label}']);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <label class="control-label" for="activefieldtestmodel-attributename">{$label}</label>
+            HTML,
+            $this->activeField->parts['{label}'],
+        );
     }
 
     public function testTabularInputErrors(): void
@@ -251,10 +456,12 @@ public function testTabularInputErrors(): void
         $this->activeField->attribute = '[0]'.$this->attributeName;
         $this->helperModel->addError($this->attributeName, 'Error Message');
 
-        $expectedValue = '<div class="form-group field-activefieldtestmodel-0-attributename has-error">';
-        $actualValue = $this->activeField->begin();
-
-        $this->assertEquals($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-0-attributename has-error">
+            HTML,
+            $this->activeField->begin(),
+        );
     }
 
     public static function hintDataProvider(): array
@@ -276,95 +483,117 @@ public function testHint(mixed $hint, string $expectedHtml): void
     {
         $this->activeField->hint($hint);
 
-        $this->assertEquals($expectedHtml, $this->activeField->parts['{hint}']);
+        $this->assertSame($expectedHtml, $this->activeField->parts['{hint}']);
     }
 
     public function testInput(): void
     {
-        $expectedValue = <<<'EOD'
-<input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
-EOD;
         $this->activeField->input('password');
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{input}']);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
 
         // with options
-        $expectedValue = <<<'EOD'
-<input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" weird="value">
-EOD;
         $this->activeField->input('password', ['weird' => 'value']);
 
-        $this->assertEquals($expectedValue, $this->activeField->parts['{input}']);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="password" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" weird="value">
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
     }
 
     public function testTextInput(): void
     {
-        $expectedValue = <<<'EOD'
-<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
-EOD;
         $this->activeField->textInput();
-        $this->assertEquals($expectedValue, $this->activeField->parts['{input}']);
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
     }
 
     public function testHiddenInput(): void
     {
-        $expectedValue = <<<'EOD'
-<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
-EOD;
         $this->activeField->hiddenInput();
-        $this->assertEquals($expectedValue, $this->activeField->parts['{input}']);
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
     }
 
     public function testListBox(): void
     {
-        $expectedValue = <<<'EOD'
-<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
-<option value="1">Item One</option>
-<option value="2">Item 2</option>
-</select>
-EOD;
         $this->activeField->listBox(['1' => 'Item One', '2' => 'Item 2']);
-        $this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']);
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
+            <option value="1">Item One</option>
+            <option value="2">Item 2</option>
+            </select>
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
 
         // https://github.com/yiisoft/yii2/issues/8848
-        $expectedValue = <<<'EOD'
-<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
-<option value="value1" disabled>Item One</option>
-<option value="value2" label="value 2">Item 2</option>
-</select>
-EOD;
         $this->activeField->listBox(['value1' => 'Item One', 'value2' => 'Item 2'], ['options' => [
             'value1' => ['disabled' => true],
             'value2' => ['label' => 'value 2'],
         ]]);
-        $this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']);
-
-        $expectedValue = <<<'EOD'
-<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
-<option value="value1" disabled>Item One</option>
-<option value="value2" selected label="value 2">Item 2</option>
-</select>
-EOD;
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
+            <option value="value1" disabled>Item One</option>
+            <option value="value2" label="value 2">Item 2</option>
+            </select>
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
+
         $this->activeField->model->{$this->attributeName} = 'value2';
         $this->activeField->listBox(['value1' => 'Item One', 'value2' => 'Item 2'], ['options' => [
             'value1' => ['disabled' => true],
             'value2' => ['label' => 'value 2'],
         ]]);
-        $this->assertEqualsWithoutLE($expectedValue, $this->activeField->parts['{input}']);
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><select id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" size="4">
+            <option value="value1" disabled>Item One</option>
+            <option value="value2" selected label="value 2">Item 2</option>
+            </select>
+            HTML,
+            $this->activeField->parts['{input}'],
+        );
     }
 
     public function testRadioList(): void
     {
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-attributename">
-<label class="control-label">Attribute Name</label>
-<input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><div id="activefieldtestmodel-attributename" role="radiogroup"><label><input type="radio" name="ActiveFieldTestModel[attributeName]" value="1"> Item One</label></div>
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
         $this->activeField->radioList(['1' => 'Item One']);
-        $this->assertEqualsWithoutLE($expectedValue, $this->activeField->render());
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <label class="control-label">Attribute Name</label>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value=""><div id="activefieldtestmodel-attributename" role="radiogroup"><label><input type="radio" name="ActiveFieldTestModel[attributeName]" value="1"> Item One</label></div>
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testGetClientOptionsReturnEmpty(): void
@@ -374,6 +603,7 @@ public function testGetClientOptionsReturnEmpty(): void
 
         // expected empty
         $actualValue = $this->activeField->getClientOptions();
+
         $this->assertEmpty($actualValue);
     }
 
@@ -386,6 +616,7 @@ public function testGetClientOptionsWithActiveAttributeInScenario(): void
 
         // expected empty
         $actualValue = $this->activeField->getClientOptions();
+
         $this->assertEmpty($actualValue);
     }
 
@@ -434,7 +665,7 @@ public function testGetClientOptionsValidatorWhenClientSet(): void
         $expectedJsExpression = 'function (attribute, value, messages, deferred, $form) {if ((function (attribute, value) '
             . "{ return 'yii2' == 'yii2'; })(attribute, value)) { return true; }}";
 
-        $this->assertEquals($expectedJsExpression, $actualValue['validate']->expression);
+        $this->assertSame($expectedJsExpression, $actualValue['validate']->expression);
     }
 
     /**
@@ -443,7 +674,8 @@ public function testGetClientOptionsValidatorWhenClientSet(): void
     public function testEnctype(): void
     {
         $this->activeField->fileInput();
-        $this->assertEquals('multipart/form-data', $this->activeField->form->options['enctype']);
+
+        $this->assertSame('multipart/form-data', $this->activeField->form->options['enctype']);
     }
 
     /**
@@ -480,17 +712,17 @@ public function testAriaAttributes(): void
     {
         $this->activeField->addAriaAttributes = true;
 
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-attributename">
-<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testAriaRequiredAttribute(): void
@@ -498,17 +730,17 @@ public function testAriaRequiredAttribute(): void
         $this->activeField->addAriaAttributes = true;
         $this->helperModel->addRule([$this->attributeName], 'required');
 
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-attributename required">
-<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-required="true">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename required">
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-required="true">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testAriaInvalidAttribute(): void
@@ -516,17 +748,17 @@ public function testAriaInvalidAttribute(): void
         $this->activeField->addAriaAttributes = true;
         $this->helperModel->addError($this->attributeName, 'Some error');
 
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-attributename has-error">
-<label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-invalid="true">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block">Some error</div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename has-error">
+            <label class="control-label" for="activefieldtestmodel-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]" aria-invalid="true">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block">Some error</div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testTabularAriaAttributes(): void
@@ -534,17 +766,17 @@ public function testTabularAriaAttributes(): void
         $this->activeField->attribute = '[0]' . $this->attributeName;
         $this->activeField->addAriaAttributes = true;
 
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-0-attributename">
-<label class="control-label" for="activefieldtestmodel-0-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-0-attributename" class="form-control" name="ActiveFieldTestModel[0][attributeName]">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-0-attributename">
+            <label class="control-label" for="activefieldtestmodel-0-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-0-attributename" class="form-control" name="ActiveFieldTestModel[0][attributeName]">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testTabularAriaRequiredAttribute(): void
@@ -553,17 +785,17 @@ public function testTabularAriaRequiredAttribute(): void
         $this->activeField->addAriaAttributes = true;
         $this->helperModel->addRule([$this->attributeName], 'required');
 
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-0-attributename required">
-<label class="control-label" for="activefieldtestmodel-0-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-0-attributename" class="form-control" name="ActiveFieldTestModel[0][attributeName]" aria-required="true">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block"></div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-0-attributename required">
+            <label class="control-label" for="activefieldtestmodel-0-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-0-attributename" class="form-control" name="ActiveFieldTestModel[0][attributeName]" aria-required="true">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testTabularAriaInvalidAttribute(): void
@@ -572,40 +804,44 @@ public function testTabularAriaInvalidAttribute(): void
         $this->activeField->addAriaAttributes = true;
         $this->helperModel->addError($this->attributeName, 'Some error');
 
-        $expectedValue = <<<'EOD'
-<div class="form-group field-activefieldtestmodel-0-attributename has-error">
-<label class="control-label" for="activefieldtestmodel-0-attributename">Attribute Name</label>
-<input type="text" id="activefieldtestmodel-0-attributename" class="form-control" name="ActiveFieldTestModel[0][attributeName]" aria-invalid="true">
-<div class="hint-block">Hint for attributeName attribute</div>
-<div class="help-block">Some error</div>
-</div>
-EOD;
-
-        $actualValue = $this->activeField->render();
-        $this->assertEqualsWithoutLE($expectedValue, $actualValue);
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-0-attributename has-error">
+            <label class="control-label" for="activefieldtestmodel-0-attributename">Attribute Name</label>
+            <input type="text" id="activefieldtestmodel-0-attributename" class="form-control" name="ActiveFieldTestModel[0][attributeName]" aria-invalid="true">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block">Some error</div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+        );
     }
 
     public function testEmptyTag(): void
     {
         $this->activeField->options = ['tag' => false];
-        $expectedValue = '<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">';
-        $actualValue = $this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render();
-        $this->assertEqualsWithoutLE($expectedValue, trim($actualValue));
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+            HTML,
+            trim($this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render()),
+        );
     }
 
     public function testWidget(): void
     {
         $this->activeField->widget(TestInputWidget::class);
-        $this->assertEquals('Render: ' . TestInputWidget::class, $this->activeField->parts['{input}']);
+        $this->assertSame('Render: ' . TestInputWidget::class, $this->activeField->parts['{input}']);
         $widget = TestInputWidget::$lastInstance;
 
         $this->assertSame($this->activeField->model, $widget->model);
-        $this->assertEquals($this->activeField->attribute, $widget->attribute);
+        $this->assertSame($this->activeField->attribute, $widget->attribute);
         $this->assertSame($this->activeField->form->view, $widget->view);
         $this->assertSame($this->activeField, $widget->field);
 
         $this->activeField->widget(TestInputWidget::class, ['options' => ['id' => 'test-id']]);
-        $this->assertEquals('test-id', $this->activeField->labelOptions['for']);
+        $this->assertSame('test-id', $this->activeField->labelOptions['for']);
     }
 
     public function testWidgetOptions(): void
@@ -620,7 +856,7 @@ public function testWidgetOptions(): void
             'aria-invalid' => 'true',
             'id' => 'activefieldtestmodel-attributename',
         ];
-        $this->assertEquals($expectedOptions, $widget->options);
+        $this->assertSame($expectedOptions, $widget->options);
 
         $this->activeField->inputOptions = [];
         $this->activeField->widget(TestInputWidget::class);
@@ -630,7 +866,7 @@ public function testWidgetOptions(): void
             'aria-invalid' => 'true',
             'id' => 'activefieldtestmodel-attributename',
         ];
-        $this->assertEquals($expectedOptions, $widget->options);
+        $this->assertSame($expectedOptions, $widget->options);
     }
 
     /**
@@ -641,28 +877,32 @@ public function testWidgetOptions(): void
     public function testOptionsClass(): void
     {
         $this->activeField->options = ['class' => 'test-wrapper'];
-        $expectedValue = <<<'HTML'
-<div class="test-wrapper field-activefieldtestmodel-attributename">
 
-<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="test-wrapper field-activefieldtestmodel-attributename">
+
+            <input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
 
 
-</div>
-HTML;
-        $actualValue = $this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render();
-        $this->assertEqualsWithoutLE($expectedValue, trim($actualValue));
+            </div>
+            HTML,
+            trim($this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render()),
+        );
 
         $this->activeField->options = ['class' => ['test-wrapper', 'test-add']];
-        $expectedValue = <<<'HTML'
-<div class="test-wrapper test-add field-activefieldtestmodel-attributename">
 
-<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="test-wrapper test-add field-activefieldtestmodel-attributename">
 
+            <input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
 
-</div>
-HTML;
-        $actualValue = $this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render();
-        $this->assertEqualsWithoutLE($expectedValue, trim($actualValue));
+
+            </div>
+            HTML,
+            trim($this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render()),
+        );
     }
 
     public function testInputOptionsTransferToWidget(): void
@@ -674,7 +914,7 @@ public function testInputOptionsTransferToWidget(): void
         $this->assertStringContainsString('placeholder="pholder_direct"', (string) $widget);
 
         // use regex clientOptions instead mask
-        $widget = $this->activeField->widget(TestMaskedInput::className(), [
+        $widget = $this->activeField->widget(TestMaskedInput::class, [
             'options' => ['placeholder' => 'pholder_direct'],
             'clientOptions' => ['regex' => '^.*$'],
         ]);
@@ -696,14 +936,258 @@ public function testInputOptionsTransferToWidget(): void
         $this->assertStringContainsString('placeholder="pholder_both_direct"', (string) $widget);
     }
 
-    public function testExceptionToString()
+    public function testRadioEnclosedByLabelFalseWithLabelOptions(): void
+    {
+        $this->activeField->radio(
+            [
+                'label' => 'Select Option A',
+                'labelOptions' => [
+                    'class' => 'custom-radio-label',
+                    'data-option' => 'option-a',
+                ],
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <label class="custom-radio-label" data-option="option-a" for="activefieldtestmodel-attributename">Select Option A</label>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="radio" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that radio renders correctly.',
+        );
+    }
+
+    public function testRadioEnclosedByLabelFalseWithLabelOptionsAndLabelFalse(): void
+    {
+        $this->activeField->radio(
+            [
+                'label' => false,
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="radio" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that radio renders correctly.',
+        );
+    }
+
+    public function testRadioEnclosedByLabelFalseWithLabelOptionsAndTagLabel(): void
     {
-        $field = new TestActiveFieldWithException();
+        $this->activeField->radio(
+            [
+                'label' => 'Choose This Option',
+                'labelOptions' => [
+                    'class' => 'radio-option-label',
+                    'data-value' => 'choice-1',
+                    'tag' => 'span',
+                ],
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <span class="radio-option-label" data-value="choice-1">Choose This Option</span>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="radio" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that radio renders correctly.',
+        );
+    }
 
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Test exception in toString.');
+    public function testRadioEnclosedByLabelFalseWithLabelOptionsAndTagLabelFalse(): void
+    {
+        $this->activeField->radio(
+            [
+                'label' => '<div class="custom-label-wrapper"><strong>Premium Option</strong> <em>(Recommended)</em></div>',
+                'labelOptions' => [
+                    'tag' => false,
+                ],
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <div class="custom-label-wrapper"><strong>Premium Option</strong> <em>(Recommended)</em></div>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="radio" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that radio renders correctly.',
+        );
+    }
+
+    public function testRadioEnclosedByLabelFalseWithoutLabelOptions(): void
+    {
+        $this->activeField->radio(
+            [
+                'label' => 'Select Option A',
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            Select Option A
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="radio" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that radio renders correctly.',
+        );
+    }
 
-        (string) $field;
+    public function testCheckboxEnclosedByLabelFalseWithLabelOptions(): void
+    {
+        $this->activeField->checkbox(
+            [
+                'label' => 'Custom Label',
+                'labelOptions' => [
+                    'class' => 'custom-label-class',
+                    'data-test' => 'custom-label-data',
+                ],
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <label class="custom-label-class" data-test="custom-label-data" for="activefieldtestmodel-attributename">Custom Label</label>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="checkbox" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that checkbox renders correctly.',
+        );
+    }
+
+    public function testCheckboxEnclosedByLabelFalseWithLabelOptionsAndLabelFalse(): void
+    {
+        $this->activeField->checkbox(
+            [
+                'label' => false,
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="checkbox" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that checkbox renders correctly.',
+        );
+    }
+
+    public function testCheckboxEnclosedByLabelFalseWithLabelOptionsAndTagLabel(): void
+    {
+        $this->activeField->checkbox(
+            [
+                'label' => 'Custom Label',
+                'labelOptions' => [
+                    'class' => 'custom-label-class',
+                    'data-test' => 'custom-label-data',
+                    'tag' => 'span',
+                ],
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <span class="custom-label-class" data-test="custom-label-data">Custom Label</span>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="checkbox" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that checkbox renders correctly.',
+        );
+    }
+
+    public function testCheckboxEnclosedByLabelFalseWithLabelOptionsAndTagLabelFalse(): void
+    {
+        $this->activeField->checkbox(
+            [
+                'label' => '<div class="custom-label-wrapper"><strong>Custom</strong> <em>Label</em></div>',
+                'labelOptions' => [
+                    'tag' => false,
+                ],
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            <div class="custom-label-wrapper"><strong>Custom</strong> <em>Label</em></div>
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="checkbox" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that checkbox renders correctly.',
+        );
+    }
+
+    public function testCheckboxEnclosedByLabelFalseWithoutLabelOptions(): void
+    {
+        $this->activeField->checkbox(
+            [
+                'label' => 'Custom Label',
+            ],
+            false,
+        );
+
+        $this->assertEqualsWithoutLE(
+            <<<HTML
+            <div class="form-group field-activefieldtestmodel-attributename">
+            Custom Label
+            <input type="hidden" name="ActiveFieldTestModel[attributeName]" value="0"><input type="checkbox" id="activefieldtestmodel-attributename" name="ActiveFieldTestModel[attributeName]" value="1">
+            <div class="hint-block">Hint for attributeName attribute</div>
+            <div class="help-block"></div>
+            </div>
+            HTML,
+            $this->activeField->render(),
+            'Failed asserting that checkbox renders correctly.',
+        );
     }
 
     /**