diff --git a/docs/filter-types/filters-number.md b/docs/filter-types/filters-number.md
index 2bfba4404..78dd191a3 100644
--- a/docs/filter-types/filters-number.md
+++ b/docs/filter-types/filters-number.md
@@ -5,6 +5,27 @@ weight: 9
 
 Number filters are just HTML number inputs.
 
+```php
+public function filters(): array
+{
+    return [
+        NumberFilter::make('Amount')
+            ->filter(function(Builder $builder, string $value) {
+                $builder->where('amount', '<', $value);
+            }),
+    ];
+}
+```
+
+Historically, min/max/placeholders were set using the "config" option, which is still available.  However, it is strongly recommended to use the new setInputAttributes for enhanced customisation.
+
+## Old Behaviour
+The following would:
+- Set a min of 0
+- Set a max of 100
+- Add a placeholder
+- Keep the default colors & styling
+
 ```php
 public function filters(): array
 {
@@ -21,3 +42,28 @@ public function filters(): array
     ];
 }
 ```
+
+## New Behaviour
+The following would:
+- Set a min of 5
+- Set a max of 20
+- Set steps to be 0.5
+- Add a placeholder
+- Keep the default colors & styling
+
+```php
+public function filters(): array
+{
+    return [
+        NumberFilter::make('Age')
+        ->setInputAttributes([
+            'min' => '5', // Minimum Value Accepted
+            'max' => '20', // Maximum Value Accepted
+            'step' => '0.5', // Set step
+            'placeholder' => 'Enter Number 0 - 100', // A placeholder value
+            'default-colors' => true,
+            'default-styling' => true,
+        ]),
+    ];
+}
+```
\ No newline at end of file
diff --git a/docs/filters/available-filter-methods.md b/docs/filters/available-filter-methods.md
index 6e17a63b4..9597372d4 100644
--- a/docs/filters/available-filter-methods.md
+++ b/docs/filters/available-filter-methods.md
@@ -208,6 +208,58 @@ TextFilter::make('Name')
     ),
 ```
 
+## setInputAttributes
+Allows for customising the attributes that will apply to the input field for the filter.
+
+By default, this replaces the default classes on the Filter Input, if you would like to keep them, set the default-styling and/or default-colors flags to true.
+
+### TextFilter Example
+The following would:
+- Set a maxlength of 75
+- Set a placeholder of "Enter a Name"
+- Replace the default colors
+- Retain the default styling (e.g. rounding/shadow)
+
+```php
+public function filters(): array
+{
+    return [
+        TextFilter::make('Name')
+        ->setInputAttributes([
+            'maxlength' => '75',
+            'placeholder' => 'Enter a Name',
+            'class' => 'text-white bg-red-500 dark:bg-red-500',
+            'default-colors' => false,
+            'default-styling' => true,
+        ]),
+    ];
+}
+```
+
+### NumberFilter Example
+The following would:
+- Set a min of 5
+- Set a max of 20
+- Set steps to be 0.5
+- Keep the default colors & styling
+
+```php
+public function filters(): array
+{
+    return [
+        NumberFilter::make('Age')
+        ->setInputAttributes([
+            'min' => '5',
+            'max' => '20',
+            'step' => '0.5',
+            'default-colors' => true,
+            'default-styling' => true,
+        ]),
+    ];
+}
+```
+
+
 ## setCustomView
 Use a fully custom view for a filter.  This will utilise solely your view when rendering this filter.  Note that the following methods will no longer apply to a filter using this:
 - setCustomFilterLabel
diff --git a/resources/views/components/tools/filters/boolean.blade.php b/resources/views/components/tools/filters/boolean.blade.php
index abc983581..759400e13 100644
--- a/resources/views/components/tools/filters/boolean.blade.php
+++ b/resources/views/components/tools/filters/boolean.blade.php
@@ -7,14 +7,15 @@
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
     <input id="thisId" type="checkbox" name="switch" class="hidden" :checked="value" />
 
-    <button id="{{ $tableName }}-filter-{{ $filter->getKey() }}"
-        x-ref="switchButton"
-        type="button"
-        @click="toggleStatusWithUpdate"
-        :class="(value == 1 || value == true)  ? 'bg-blue-600' : 'bg-neutral-200'"
-        class="relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10"
-        x-cloak>
-        <span :class="(value == 1 || value == true) ? 'translate-x-[18px]' : 'translate-x-0.5'" class="w-5 h-5 duration-200 ease-in-out bg-white rounded-full shadow-md"></span>
+    <button x-cloak {{ $filterInputAttributes->merge([
+                ":class" => "(value == 1 || value == true) ? '".$filterInputAttributes['activeColor']."' : '".$filterInputAttributes['inactiveColor']."'",
+            ])
+            ->class([
+                'relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10' => ($filterInputAttributes['default-styling'] ?? true)
+            ])
+            ->except(['default-styling','default-colors','activeColor','inactiveColor','blobColor'])
+        }}>
+        <span :class="(value == 1 || value == true) ? 'translate-x-[18px]' : 'translate-x-0.5'" class="w-5 h-5 duration-200 ease-in-out rounded-full shadow-md {{ $filterInputAttributes['blobColor'] }}"></span>
     </button>
     <template x-if="(value == 1 || value == true)">
         <button @click="toggleStatusWithReset" type="button"
diff --git a/resources/views/components/tools/filters/date.blade.php b/resources/views/components/tools/filters/date.blade.php
index e3c75f0b0..b32b38bbb 100644
--- a/resources/views/components/tools/filters/date.blade.php
+++ b/resources/views/components/tools/filters/date.blade.php
@@ -4,17 +4,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'date') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="date"
-            @if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
-            @if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300  focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/resources/views/components/tools/filters/datetime.blade.php b/resources/views/components/tools/filters/datetime.blade.php
index 1ca67a233..74d80455a 100644
--- a/resources/views/components/tools/filters/datetime.blade.php
+++ b/resources/views/components/tools/filters/datetime.blade.php
@@ -5,17 +5,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'datetime') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="datetime-local"
-            @if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
-            @if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/resources/views/components/tools/filters/multi-select-dropdown.blade.php b/resources/views/components/tools/filters/multi-select-dropdown.blade.php
index a9c86ff68..a0f1a580b 100644
--- a/resources/views/components/tools/filters/multi-select-dropdown.blade.php
+++ b/resources/views/components/tools/filters/multi-select-dropdown.blade.php
@@ -2,37 +2,22 @@
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
     @if ($isTailwind)
-        <div class="rounded-md shadow-sm">
-            <select multiple
-                {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-                wire:key="{{ $filter->generateWireKey($tableName, 'multiselectdropdown') }}"
-                id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-                class="block w-full transition duration-150 ease-in-out border-gray-300 rounded-md shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600"
-            >
-            @if ($filter->getFirstOption() !== '')
-                <option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
-            @endif
-                @foreach($filter->getOptions() as $key => $value)
-                    @if (is_iterable($value))
-                        <optgroup label="{{ $key }}">
-                            @foreach ($value as $optionKey => $optionValue)
-                                <option value="{{ $optionKey }}">{{ $optionValue }}</option>
-                            @endforeach
-                        </optgroup>
-                    @else
-                        <option value="{{ $key }}">{{ $value }}</option>
-                    @endif
-                @endforeach
-            </select>
-        </div>
-    @elseif ($isBootstrap)
+    <div class="rounded-md shadow-sm">
+    @endif
         <select multiple
-            {{ $filter->getWireMethod("filterComponents.".$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'multiselectdropdown') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            class="{{ $isBootstrap4 ? 'form-control' : 'form-select' }}"
-        >
-        @if ($filter->getFirstOption() != "")
+            {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge([
+                    'wire:key' => $filter->generateWireKey($tableName, 'multiselectdropdown'),
+                ])
+                ->class([
+                    'block w-full transition duration-150 ease-in-out rounded-md shadow-sm focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap4 && ($filterInputAttributes['default-styling'] ?? true),
+                    'form-select' => $isBootstrap5 && ($filterInputAttributes['default-styling'] ?? true),
+                ])
+                ->except(['default-styling','default-colors']) 
+            }}>
+        @if ($filter->getFirstOption() !== '')
             <option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
         @endif
             @foreach($filter->getOptions() as $key => $value)
@@ -47,5 +32,7 @@ class="{{ $isBootstrap4 ? 'form-control' : 'form-select' }}"
                 @endif
             @endforeach
         </select>
+    @if ($isTailwind)
+    </div>
     @endif
 </div>
diff --git a/resources/views/components/tools/filters/multi-select.blade.php b/resources/views/components/tools/filters/multi-select.blade.php
index 582848bd3..6ee391a71 100644
--- a/resources/views/components/tools/filters/multi-select.blade.php
+++ b/resources/views/components/tools/filters/multi-select.blade.php
@@ -2,61 +2,57 @@
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
     @if ($isTailwind)
-        <div class="rounded-md shadow-sm">
-            <div>
-                <input
-                    type="checkbox"
-                    id="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                    wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')"
-                    class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 disabled:opacity-50 disabled:cursor-wait"
-                >
-                <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif" class="dark:text-white">
+    <div class="rounded-md shadow-sm">
+    @endif
+        <div @class(['form-check' => $isBootstrap])>
+            <input id="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')" {{ 
+                    $filterInputAttributes->merge([
+                        'type' => 'checkbox'
+                    ])
+                    ->class([
+                        'rounded shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                        'text-indigo-600 border-gray-300 focus:border-indigo-300  focus:ring-indigo-200  dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 ' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                        'form-check-input' => $isBootstrap && ($filterInputAttributes['default-styling'] ?? true),
+                    ])
+                    ->except(['id','wire:key','value','default-styling','default-colors']) 
+                }}>
+            <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" @class([
+                'dark:text-white' => $isTailwind,
+                'form-check-label' => $isBootstrap,
+                ])>
                 @if ($filter->getFirstOption() !== '')
                     {{ $filter->getFirstOption() }}
                 @else
                     {{ __($localisationPath.'All') }}
                 @endif
-                </label>
-            </div>
-
-            @foreach($filter->getOptions() as $key => $value)
-                <div wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-multiselect-{{ $key }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif">
-                    <input
-                        type="checkbox"
-                        id="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                        value="{{ $key }}"
-                        wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                        {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-                        class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 disabled:opacity-50 disabled:cursor-wait"
-                    >
-                    <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif" class="dark:text-white">{{ $value }}</label>
-                </div>
-            @endforeach
-        </div>
-    @elseif ($isBootstrap)
-        <div class="form-check">
-            <input
-                type="checkbox"
-                id="{{ $tableName }}-filter-{{ $filter->getKey() }}-select-all-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')"
-                class="form-check-input"
-            >
-            <label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif-select-all">{{ __($localisationPath.'All') }}</label>
+            </label>
         </div>
 
         @foreach($filter->getOptions() as $key => $value)
-            <div class="form-check" wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-multiselect-{{ $key }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif">
-                <input
-                    class="form-check-input"
-                    type="checkbox"
-                    id="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                    value="{{ $key }}"
-                    wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif"
-                    {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-
-                >
-                <label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}-@if($filter->hasCustomPosition()){{ $filter->getCustomPosition() }}@endif">{{ $value }}</label>
+            <div @class([
+                'form-check' => $isBootstrap,
+                ]) wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-multiselect-{{ $key }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}">
+                <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} 
+                id="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" 
+                
+                wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" value="{{ $key }}" {{ 
+                    $filterInputAttributes->merge([
+                        'type' => 'checkbox'
+                    ])
+                    ->class([
+                        'rounded shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 disabled:opacity-50 disabled:cursor-wait' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                        'text-indigo-600 border-gray-300 focus:border-indigo-300  focus:ring-indigo-200  dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 ' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                        'form-check-input' => $isBootstrap && ($filterInputAttributes['default-styling'] ?? true),
+                    ])
+                    ->except(['id','wire:key','value','default-styling','default-colors']) 
+                }}>
+                <label for="{{ $tableName }}-filter-{{ $filter->getKey() }}-{{ $loop->index }}{{ $filter->hasCustomPosition() ? '-'.$filter->getCustomPosition() : null }}" @class([
+                    'dark:text-white' => $isTailwind,
+                    'form-check-label' => $isBootstrap,
+                ])>{{ $value }}</label>
             </div>
         @endforeach
+    @if ($isTailwind)
+    </div>
     @endif
 </div>
diff --git a/resources/views/components/tools/filters/number.blade.php b/resources/views/components/tools/filters/number.blade.php
index bca4f1956..0c8e766cb 100644
--- a/resources/views/components/tools/filters/number.blade.php
+++ b/resources/views/components/tools/filters/number.blade.php
@@ -5,17 +5,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'number') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="number"
-            @if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
-            @if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge() 
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/resources/views/components/tools/filters/select.blade.php b/resources/views/components/tools/filters/select.blade.php
index 7ff281a76..d3f5dfe1a 100644
--- a/resources/views/components/tools/filters/select.blade.php
+++ b/resources/views/components/tools/filters/select.blade.php
@@ -5,7 +5,7 @@
         'rounded-md shadow-sm' => $isTailwind,
         'inline' => $isBootstrap,
     ])>
-        <select {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
+        <select {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} 
             wire:key="{{ $filter->generateWireKey($tableName, 'select') }}"
             id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
             @class([
diff --git a/resources/views/components/tools/filters/text-field.blade.php b/resources/views/components/tools/filters/text-field.blade.php
index edf6898bc..74d80455a 100644
--- a/resources/views/components/tools/filters/text-field.blade.php
+++ b/resources/views/components/tools/filters/text-field.blade.php
@@ -5,16 +5,14 @@
         'rounded-md shadow-sm' => $isTailwind,
         'mb-3 mb-md-0 input-group' => $isBootstrap,
     ])>
-        <input {{ $filter->getWireMethod('filterComponents.'.$filter->getKey()) }}
-            wire:key="{{ $filter->generateWireKey($tableName, 'text') }}"
-            id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
-            type="text"
-            @if($filter->hasConfig('placeholder')) placeholder="{{ $filter->getConfig('placeholder') }}" @endif
-            @if($filter->hasConfig('maxlength')) maxlength="{{ $filter->getConfig('maxlength') }}" @endif
-            @class([
-                'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind,
-                'form-control' => $isBootstrap,
-            ])
-        />
+        <input {!! $filter->getWireMethod('filterComponents.'.$filter->getKey()) !!} {{ 
+                $filterInputAttributes->merge()
+                ->class([
+                    'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true),
+                    'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true),
+                    'form-control' => $isBootstrap,
+                ])
+                ->except(['default-styling','default-colors']) 
+            }} />
     </div>
 </div>
diff --git a/src/Views/Filters/BooleanFilter.php b/src/Views/Filters/BooleanFilter.php
index c43b517fb..f629a2c48 100644
--- a/src/Views/Filters/BooleanFilter.php
+++ b/src/Views/Filters/BooleanFilter.php
@@ -55,6 +55,22 @@ public function isEmpty(bool|int|string|null $value): bool
         return true;
     }
 
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                '@click' => 'toggleStatusWithUpdate',
+                'activeColor' => 'bg-blue-600',
+                'blobColor' => 'bg-white',
+                'inactiveColor' => 'bg-neutral-200',
+                'type' => 'button',
+                'x-ref' => 'switchButton',
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
+
     /**
      * Gets the Default Value for this Filter via the Component
      */
diff --git a/src/Views/Filters/DateFilter.php b/src/Views/Filters/DateFilter.php
index 66965547a..44e2aed51 100644
--- a/src/Views/Filters/DateFilter.php
+++ b/src/Views/Filters/DateFilter.php
@@ -41,4 +41,19 @@ public function getFilterPillValue($value): ?string
 
         return null;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'min' => $this->hasConfig('min') ? $this->getConfig('min') : null,
+                'max' => $this->hasConfig('max') ? $this->getConfig('max') : null,
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'type' => 'date',
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'date'),
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Filters/DateTimeFilter.php b/src/Views/Filters/DateTimeFilter.php
index 3df56e7be..8bb2f05d0 100644
--- a/src/Views/Filters/DateTimeFilter.php
+++ b/src/Views/Filters/DateTimeFilter.php
@@ -42,4 +42,19 @@ public function getFilterPillValue($value): ?string
 
         return null;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'min' => $this->hasConfig('min') ? $this->getConfig('min') : null,
+                'max' => $this->hasConfig('max') ? $this->getConfig('max') : null,
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'type' => 'datetime-local',
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'datetime'),
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Filters/NumberFilter.php b/src/Views/Filters/NumberFilter.php
index 259c99b95..9aa8249ce 100644
--- a/src/Views/Filters/NumberFilter.php
+++ b/src/Views/Filters/NumberFilter.php
@@ -34,4 +34,20 @@ public function validate(float|int|string|array $value): float|int|string|false
 
         return false;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'min' => $this->hasConfig('min') ? $this->getConfig('min') : null,
+                'max' => $this->hasConfig('max') ? $this->getConfig('max') : null,
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'type' => 'number',
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'number'),
+
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Filters/TextFilter.php b/src/Views/Filters/TextFilter.php
index c44cca906..173c5c95c 100644
--- a/src/Views/Filters/TextFilter.php
+++ b/src/Views/Filters/TextFilter.php
@@ -24,4 +24,19 @@ public function validate(string $value): string|bool
 
         return strlen($value) ? $value : false;
     }
+
+    protected function getCoreInputAttributes(): array
+    {
+        $attributes = array_merge(parent::getCoreInputAttributes(),
+            [
+                'type' => 'text',
+                'placeholder' => $this->hasConfig('placeholder') ? $this->getConfig('placeholder') : null,
+                'maxlength' => $this->hasConfig('maxlength') ? $this->getConfig('maxlength') : null,
+                'wire:key' => $this->generateWireKey($this->getGenericDisplayData()['tableName'], 'text'),
+
+            ]);
+        ksort($attributes);
+
+        return $attributes;
+    }
 }
diff --git a/src/Views/Traits/Configuration/FilterConfiguration.php b/src/Views/Traits/Configuration/FilterConfiguration.php
index 123dda5f0..2bc40c32a 100644
--- a/src/Views/Traits/Configuration/FilterConfiguration.php
+++ b/src/Views/Traits/Configuration/FilterConfiguration.php
@@ -54,13 +54,6 @@ public function setFilterDefaultValue($value): self
         return $this;
     }
 
-    public function setFilterLabelAttributes(array $filterLabelAttributes): self
-    {
-        $this->filterLabelAttributes = [...['default' => false], ...$filterLabelAttributes];
-
-        return $this;
-    }
-
     public function setGenericDisplayData(array $genericDisplayData = []): self
     {
         $this->genericDisplayData = [
diff --git a/src/Views/Traits/Core/HasWireables.php b/src/Views/Traits/Core/HasWireables.php
index c0a7e34af..938d8baf1 100644
--- a/src/Views/Traits/Core/HasWireables.php
+++ b/src/Views/Traits/Core/HasWireables.php
@@ -76,10 +76,10 @@ public function getWireMethodString(string $wireMethod, string $wireableElement)
     {
 
         if ($wireMethod != 'defer') {
-            return 'wire:model.'.$wireMethod.'='.$wireableElement;
+            return 'wire:model.'.$wireMethod.'="'.$wireableElement.'"';
         }
 
-        return 'wire:model='.$wireableElement;
+        return 'wire:model="'.$wireableElement.'"';
 
     }
 }
diff --git a/src/Views/Traits/Helpers/FilterHelpers.php b/src/Views/Traits/Helpers/FilterHelpers.php
index 3af1ce088..5ec88943c 100644
--- a/src/Views/Traits/Helpers/FilterHelpers.php
+++ b/src/Views/Traits/Helpers/FilterHelpers.php
@@ -133,16 +133,6 @@ public function hasFilterDefaultValue(): bool
         return ! is_null($this->filterDefaultValue);
     }
 
-    public function getFilterLabelAttributes(): array
-    {
-        return [...['default' => true], ...$this->filterLabelAttributes];
-    }
-
-    public function hasFilterLabelAttributes(): bool
-    {
-        return $this->getFilterLabelAttributes() != ['default' => true] && $this->getFilterLabelAttributes() != ['default' => false];
-    }
-
     public function generateWireKey(string $tableName, string $filterType, string $extraData = ''): string
     {
         return $tableName.'-filter-'.$filterType.'-'.$this->getKey().($extraData != '' ? '-'.$extraData : '').($this->hasCustomPosition() ? '-'.$this->getCustomPosition() : '');
@@ -160,6 +150,8 @@ public function getFilterDisplayData(): array
 
     public function render(): string|\Illuminate\Contracts\Foundation\Application|\Illuminate\View\View|\Illuminate\View\Factory
     {
-        return view($this->getViewPath(), $this->getFilterDisplayData());
+        return view($this->getViewPath())
+            ->with($this->getFilterDisplayData())
+            ->with(['filterInputAttributes' => $this->getInputAttributesBag()]);
     }
 }
diff --git a/src/Views/Traits/IsFilter.php b/src/Views/Traits/IsFilter.php
index 9e5a7b47b..ed1db9067 100644
--- a/src/Views/Traits/IsFilter.php
+++ b/src/Views/Traits/IsFilter.php
@@ -7,6 +7,7 @@
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig, HasLabelAttributes, HasView};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasCustomPosition, HasVisibility};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\FilterHelpers;
+use Rappasoft\LaravelLivewireTables\Views\Traits\Styling\{HandlesFilterInputAttributes, HandlesFilterLabelAttributes};
 
 trait IsFilter
 {
@@ -17,7 +18,9 @@ trait IsFilter
         HasCustomPosition,
         HasLabelAttributes,
         HasVisibility,
-        HasView;
+        HasView,
+        HandlesFilterInputAttributes,
+        HandlesFilterLabelAttributes;
 
     protected string $name;
 
@@ -33,8 +36,6 @@ trait IsFilter
 
     protected ?string $filterCustomLabel = null;
 
-    protected array $filterLabelAttributes = [];
-
     protected ?string $filterCustomPillBlade = null;
 
     protected mixed $filterDefaultValue = null;
diff --git a/src/Views/Traits/Styling/HandlesFilterInputAttributes.php b/src/Views/Traits/Styling/HandlesFilterInputAttributes.php
new file mode 100644
index 000000000..a921c7808
--- /dev/null
+++ b/src/Views/Traits/Styling/HandlesFilterInputAttributes.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+
+use Illuminate\View\ComponentAttributeBag;
+
+trait HandlesFilterInputAttributes
+{
+    protected array $filterInputAttributes = [];
+
+    public function getInputAttributesBag(): ComponentAttributeBag
+    {
+        $attributes = array_merge($this->getCoreInputAttributes(), $this->getInputAttributes());
+        ksort($attributes);
+
+        return new ComponentAttributeBag($attributes);
+    }
+
+    protected function getInputAttributes(): array
+    {
+        return $this->filterInputAttributes;
+    }
+
+    protected function getCoreInputAttributes(): array
+    {
+        return [
+            'id' => $this->getGenericDisplayData()['tableName'].'-filter-'.$this->getKey().($this->hasCustomPosition() ? '-'.$this->getCustomPosition() : ''),
+            'default-styling' => true,
+            'default-colors' => true,
+        ];
+    }
+
+    public function setInputAttributes(array $filterInputAttributes): self
+    {
+        $this->filterInputAttributes = array_merge([
+            'default-styling' => false,
+            'default-colors' => false,
+        ], $filterInputAttributes);
+
+        return $this;
+    }
+}
diff --git a/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php b/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
new file mode 100644
index 000000000..b175478a9
--- /dev/null
+++ b/src/Views/Traits/Styling/HandlesFilterLabelAttributes.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Traits\Styling;
+
+use Illuminate\View\ComponentAttributeBag;
+
+trait HandlesFilterLabelAttributes
+{
+    protected array $filterLabelAttributes = [];
+
+    public function getFilterLabelAttributes(): array
+    {
+        return [...['default' => true], ...$this->filterLabelAttributes];
+    }
+
+    public function hasFilterLabelAttributes(): bool
+    {
+        return $this->getFilterLabelAttributes() != ['default' => true] && $this->getFilterLabelAttributes() != ['default' => false];
+    }
+
+    public function setFilterLabelAttributes(array $filterLabelAttributes): self
+    {
+        $this->filterLabelAttributes = [...['default' => false], ...$filterLabelAttributes];
+
+        return $this;
+    }
+}
diff --git a/tests/Unit/Traits/Configuration/FilterConfigurationTest.php b/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
index 0f5e85b35..d9756b5e6 100644
--- a/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
+++ b/tests/Unit/Traits/Configuration/FilterConfigurationTest.php
@@ -2,9 +2,11 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Configuration;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class FilterConfigurationTest extends TestCase
 {
     public function test_filters_status_can_be_set(): void
diff --git a/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
index a9a40033c..849da880f 100644
--- a/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
+++ b/tests/Unit/Traits/Core/QueryStrings/QueryStringForFiltersTest.php
@@ -4,9 +4,11 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class QueryStringForFiltersTest extends TestCase
 {
     public function test_can_get_default_filter_query_string_status(): void
diff --git a/tests/Unit/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
index 367dd1d1a..80995c042 100644
--- a/tests/Unit/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Traits/Helpers/FilterHelpersTest.php
@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Helpers;
 
 use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Events\FilterApplied;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
@@ -13,6 +14,7 @@
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
+#[Group('Filters')]
 final class FilterHelpersTest extends TestCase
 {
     public function test_can_get_filters_status(): void
diff --git a/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php b/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php
index 886ae1956..48980ee48 100644
--- a/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php
+++ b/tests/Unit/Traits/Styling/FilterPopoverStylingTest.php
@@ -2,8 +2,10 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Styling;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class FilterPopoverStylingTest extends TestCase
 {
     public function test_filter_popover_attributes_returns_default_if_not_set(): void
diff --git a/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php b/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php
index 5ba1ac182..baddf7316 100644
--- a/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php
+++ b/tests/Unit/Traits/Styling/FilterSlidedownStylingTest.php
@@ -2,8 +2,10 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Styling;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 final class FilterSlidedownStylingTest extends TestCase
 {
     public function test_filter_slidedown_wrapper_attributes_returns_default_if_not_set(): void
diff --git a/tests/Unit/Views/Filters/BooleanFilterTest.php b/tests/Unit/Views/Filters/BooleanFilterTest.php
index 5fb5203e4..63f7edcf5 100644
--- a/tests/Unit/Views/Filters/BooleanFilterTest.php
+++ b/tests/Unit/Views/Filters/BooleanFilterTest.php
@@ -2,14 +2,26 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\BooleanFilter;
 
+#[Group('Filters')]
 final class BooleanFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = BooleanFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            '@click' => 'toggleStatusWithUpdate',
+            'activeColor' => 'bg-blue-600',
+            'blobColor' => 'bg-white',
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'inactiveColor' => 'bg-neutral-200',
+            'type' => 'button',
+            'x-ref' => 'switchButton',
+        ];
+
     }
 
     public function test_can_not_set_boolean_filter_to_non_number(): void
@@ -41,28 +53,26 @@ public function test_cannot_set_boolean_filter_to_valid_string(): void
 
     public function test_can_get_custom_filter_pills(): void
     {
-        $filter = self::$filterInstance;
-        $filter->setFilterPillValues([
+        self::$filterInstance->setFilterPillValues([
             true => 'Active',
             false => 'Inactive',
         ]);
-        $this->assertSame('Active', $filter->getFilterPillValue(1));
-        $this->assertSame('Inactive', $filter->getFilterPillValue(0));
+        $this->assertSame('Active', self::$filterInstance->getFilterPillValue(1));
+        $this->assertSame('Inactive', self::$filterInstance->getFilterPillValue(0));
     }
 
     public function test_can_set_default_values(): void
     {
-        $filter = self::$filterInstance;
-        $this->assertFalse($filter->hasFilterDefaultValue());
-        $this->assertNull($filter->getFilterDefaultValue());
+        $this->assertFalse(self::$filterInstance->hasFilterDefaultValue());
+        $this->assertNull(self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(true);
-        $this->assertTrue($filter->hasFilterDefaultValue());
-        $this->assertSame(true, $filter->getFilterDefaultValue());
+        self::$filterInstance->setFilterDefaultValue(true);
+        $this->assertTrue(self::$filterInstance->hasFilterDefaultValue());
+        $this->assertSame(true, self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(false);
-        $this->assertTrue($filter->hasFilterDefaultValue());
-        $this->assertSame(false, $filter->getFilterDefaultValue());
+        self::$filterInstance->setFilterDefaultValue(false);
+        $this->assertTrue(self::$filterInstance->hasFilterDefaultValue());
+        $this->assertSame(false, self::$filterInstance->getFilterDefaultValue());
 
     }
 
@@ -93,23 +103,85 @@ public function test_can_get_if_boolean_filter_not_empty_invalid_string(): void
 
     public function test_can_validate_null_boolean_filter_value(): void
     {
-        $filter = self::$filterInstance;
-        $filter->setFilterPillValues([
+        self::$filterInstance->setFilterPillValues([
             true => 'Active',
             false => 'Inactive',
         ]);
 
-        $this->assertFalse($filter->validate(null));
+        $this->assertFalse(self::$filterInstance->validate(null));
     }
 
     public function test_is_empty_null_boolean_filter_value(): void
     {
-        $filter = self::$filterInstance;
-        $filter->setFilterPillValues([
+        self::$filterInstance->setFilterPillValues([
             true => 'Active',
             false => 'Inactive',
         ]);
 
-        $this->assertTrue($filter->isEmpty(null));
+        $this->assertTrue(self::$filterInstance->isEmpty(null));
+    }
+
+    public function test_can_set_custom_input_attributes_boolean(): void
+    {
+
+        self::$filterInstance->setGenericDisplayData(self::$testGenericData);
+        $baseAttributes = self::$filterInstance->getInputAttributesBag();
+
+        $this->assertTrue($baseAttributes['default-styling']);
+        $this->assertTrue($baseAttributes['default-colors']);
+
+        self::$filterInstance->setInputAttributes([
+            'class' => 'bg-red-500',
+        ]);
+
+        $this->assertFalse(self::$filterInstance->getInputAttributesBag()['default-styling']);
+        $this->assertFalse(self::$filterInstance->getInputAttributesBag()['default-colors']);
+        $this->assertSame('bg-red-500', self::$filterInstance->getInputAttributesBag()['class']);
+        self::$filterInstance->setInputAttributes([
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-styling' => true,
+        ]);
+        $currentAttributeBag = self::$filterInstance->getInputAttributesBag()->getAttributes();
+        ksort($currentAttributeBag);
+
+        $this->assertTrue($currentAttributeBag['default-styling']);
+        $this->assertFalse($currentAttributeBag['default-colors']);
+        $this->assertSame('bg-red-500 dark:bg-red-500', $currentAttributeBag['class']);
+
+        $this->assertSame([
+            '@click' => 'toggleStatusWithUpdate',
+            'activeColor' => 'bg-blue-600',
+            'blobColor' => 'bg-white',
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'id' => $baseAttributes['id'],
+            'inactiveColor' => 'bg-neutral-200',
+            'type' => 'button',
+            'x-ref' => 'switchButton',
+        ], $currentAttributeBag);
+
+        self::$filterInstance->setInputAttributes([
+            'activeColor' => 'bg-red-600',
+            'blobColor' => 'bg-green-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'inactiveColor' => 'bg-blue-200',
+        ]);
+        $currentAttributeBag = self::$filterInstance->getInputAttributesBag()->getAttributes();
+        ksort($currentAttributeBag);
+
+        $this->assertSame([
+            '@click' => 'toggleStatusWithUpdate',
+            'activeColor' => 'bg-red-600',
+            'blobColor' => 'bg-green-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'id' => $baseAttributes['id'],
+            'inactiveColor' => 'bg-blue-200',
+            'type' => 'button',
+            'x-ref' => 'switchButton',
+        ], $currentAttributeBag);
+
     }
 }
diff --git a/tests/Unit/Views/Filters/DateFilterTest.php b/tests/Unit/Views/Filters/DateFilterTest.php
index 5305408ae..ebf89d03e 100644
--- a/tests/Unit/Views/Filters/DateFilterTest.php
+++ b/tests/Unit/Views/Filters/DateFilterTest.php
@@ -3,14 +3,24 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use DateTime;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
 
+#[Group('Filters')]
 final class DateFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = DateFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'max' => null,
+            'min' => null,
+            'placeholder' => null,
+            'type' => 'date',
+            'wire:key' => 'test123-filter-date-active',
+        ];
+
     }
 
     public function test_can_not_set_date_filter_to_non_number(): void
@@ -146,33 +156,33 @@ public function test_can_set_text_filter_wireable_live(): void
     {
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireBlur();
 
         $this->assertSame('blur', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireLive();
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDefer();
 
         $this->assertSame('defer', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 
diff --git a/tests/Unit/Views/Filters/DateRangeFilterTest.php b/tests/Unit/Views/Filters/DateRangeFilterTest.php
index aa73aac9b..a6dccecac 100644
--- a/tests/Unit/Views/Filters/DateRangeFilterTest.php
+++ b/tests/Unit/Views/Filters/DateRangeFilterTest.php
@@ -3,8 +3,10 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateRangeFilter;
 
+#[Group('Filters')]
 final class DateRangeFilterTest extends FilterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Views/Filters/DateTimeFilterTest.php b/tests/Unit/Views/Filters/DateTimeFilterTest.php
index 341d2e847..7c3674b25 100644
--- a/tests/Unit/Views/Filters/DateTimeFilterTest.php
+++ b/tests/Unit/Views/Filters/DateTimeFilterTest.php
@@ -4,14 +4,24 @@
 
 use DateTime;
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter;
 
+#[Group('Filters')]
 final class DateTimeFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = DateTimeFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'max' => null,
+            'min' => null,
+            'placeholder' => null,
+            'type' => 'datetime-local',
+            'wire:key' => 'test123-filter-datetime-active',
+        ];
+
     }
 
     public function test_can_get_filter_callback(): void
@@ -137,33 +147,33 @@ public function test_can_set_text_filter_wireable_live(): void
     {
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireBlur();
 
         $this->assertSame('blur', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireLive();
 
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDefer();
 
         $this->assertSame('defer', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 }
diff --git a/tests/Unit/Views/Filters/FilterTestCase.php b/tests/Unit/Views/Filters/FilterTestCase.php
index 917bf9a21..244557393 100644
--- a/tests/Unit/Views/Filters/FilterTestCase.php
+++ b/tests/Unit/Views/Filters/FilterTestCase.php
@@ -2,15 +2,35 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Filters')]
 abstract class FilterTestCase extends TestCase
 {
     protected static $filterInstance;
 
+    protected static $testGenericData;
+
+    protected static $extraFilterInputAttributes;
+
     protected function setUp(): void
     {
         parent::setUp();
+        self::$testGenericData = [
+            'filterLayout' => 'tailwind',
+            'tableName' => 'test123',
+            'isTailwind' => true,
+            'isBootstrap' => false,
+            'isBootstrap4' => false,
+            'isBootstrap5' => false,
+            'localisationPath' => 'livewire-tables::core.',
+        ];
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$extraFilterInputAttributes = null;
     }
 
     public function test_can_get_filter_name(): void
@@ -93,4 +113,47 @@ public function test_can_check_if_filter_is_reset_by_clear_button(): void
 
         $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
+
+    public function test_can_set_custom_input_attributes(): void
+    {
+        $filter = self::$filterInstance;
+
+        $filter->setGenericDisplayData(self::$testGenericData);
+        $baseAttributes = $filter->getInputAttributesBag();
+
+        $this->assertTrue($baseAttributes['default-styling']);
+        $this->assertTrue($baseAttributes['default-colors']);
+
+        $filter->setInputAttributes([
+            'class' => 'bg-red-500',
+        ]);
+
+        $this->assertFalse($filter->getInputAttributesBag()['default-styling']);
+        $this->assertFalse($filter->getInputAttributesBag()['default-colors']);
+        $this->assertSame('bg-red-500', $filter->getInputAttributesBag()['class']);
+        $filter->setInputAttributes([
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-styling' => true,
+        ]);
+        $currentAttributeBag = $filter->getInputAttributesBag()->getAttributes();
+        ksort($currentAttributeBag);
+
+        $this->assertTrue($currentAttributeBag['default-styling']);
+        $this->assertFalse($currentAttributeBag['default-colors']);
+        $this->assertSame('bg-red-500 dark:bg-red-500', $currentAttributeBag['class']);
+
+        $standardAttributes = [
+            'class' => 'bg-red-500 dark:bg-red-500',
+            'default-colors' => false,
+            'default-styling' => true,
+            'id' => $baseAttributes['id'],
+        ];
+        if (isset(self::$extraFilterInputAttributes)) {
+            $standardAttributes = array_merge($standardAttributes, self::$extraFilterInputAttributes);
+            ksort($standardAttributes);
+        }
+
+        $this->assertSame($standardAttributes, $currentAttributeBag);
+
+    }
 }
diff --git a/tests/Unit/Views/Filters/LivewireComponentFilterTest.php b/tests/Unit/Views/Filters/LivewireComponentFilterTest.php
index 447e229b6..4fb58ce75 100644
--- a/tests/Unit/Views/Filters/LivewireComponentFilterTest.php
+++ b/tests/Unit/Views/Filters/LivewireComponentFilterTest.php
@@ -3,8 +3,10 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\LivewireComponentFilter;
 
+#[Group('Filters')]
 final class LivewireComponentFilterTest extends FilterTestCase
 {
     protected function setUp(): void
@@ -15,35 +17,31 @@ protected function setUp(): void
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = LivewireComponentFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $this->assertFalse($filter->hasFilterCallback());
-
-        $filter = LivewireComponentFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('name', '=', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_set_livewire_component_filter_to_text(): void
     {
-        $filter = LivewireComponentFilter::make('BreedID');
-        $this->assertSame('test', $filter->validate('test'));
-        $this->assertSame('123', $filter->validate(123));
+        $this->assertSame('test', self::$filterInstance->validate('test'));
+        $this->assertSame('123', self::$filterInstance->validate(123));
 
     }
 
     public function test_can_get_if_livewire_component_filter_empty(): void
     {
-        $filter = LivewireComponentFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(null));
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertFalse($filter->isEmpty('123'));
-        $this->assertFalse($filter->isEmpty('test'));
-        $this->assertFalse($filter->isEmpty(1234));
+        $this->assertTrue(self::$filterInstance->isEmpty(null));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertFalse(self::$filterInstance->isEmpty('123'));
+        $this->assertFalse(self::$filterInstance->isEmpty('test'));
+        $this->assertFalse(self::$filterInstance->isEmpty(1234));
 
     }
 }
diff --git a/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php b/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
index dc5b55880..864909b53 100644
--- a/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
+++ b/tests/Unit/Views/Filters/MultiSelectDropdownFilterTest.php
@@ -4,13 +4,21 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
 
-final class MultiSelectDropdownFilterTest extends TestCase
+#[Group('Filters')]
+final class MultiSelectDropdownFilterTest extends FilterTestCase
 {
     public array $optionsArray = [];
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = MultiSelectDropdownFilter::make('Active');
+    }
+
     public function test_array_setup(): array
     {
         $this->optionsArray = $optionsArray = array_values(['Cartman', 'Tux', 'May', 'Ben', 'Chico']);
@@ -21,251 +29,225 @@ public function test_array_setup(): array
 
     public function test_can_get_filter_name(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getName());
+        $this->assertSame('Active', self::$filterInstance->getName());
     }
 
     public function test_can_get_filter_key(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame('active', $filter->getKey());
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame([], $filter->getConfigs());
+        $this->assertSame([], self::$filterInstance->getConfigs());
 
-        $filter->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertSame(['foo' => 'bar'], $filter->getConfigs());
+        $this->assertSame(['foo' => 'bar'], self::$filterInstance->getConfigs());
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertSame([], $filter->getDefaultValue());
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->hasFilterCallback());
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $filter = MultiSelectDropdownFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('name', '=', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        self::$filterInstance->setFilterPillTitle('User Status');
 
-        $filter = MultiSelectDropdownFilter::make('Active')
-            ->setFilterPillTitle('User Status');
-
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_get_filter_pill_value(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
-        $this->assertSame($optionsArray[1], $filter->getFilterPillValue(['1'])[0]);
-        $this->assertSame([$optionsArray[1], $optionsArray[2]], $filter->getFilterPillValue(['1', '2']));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame($optionsArray[1], self::$filterInstance->getFilterPillValue(['1'])[0]);
+        $this->assertSame([$optionsArray[1], $optionsArray[2]], self::$filterInstance->getFilterPillValue(['1', '2']));
     }
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->hasConfigs());
+        $this->assertFalse(self::$filterInstance->hasConfigs());
 
-        $filter = MultiSelectDropdownFilter::make('Active')
-            ->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $filter->hiddenFromMenus();
+        self::$filterInstance->hiddenFromMenus();
 
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        self::$filterInstance->hiddenFromPills();
 
-        $filter->hiddenFromPills();
-
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $filter->hiddenFromFilterCount();
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-
-        $this->assertTrue($filter->isResetByClearButton());
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $filter->notResetByClearButton();
+        self::$filterInstance->notResetByClearButton();
 
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_number(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame(123, $filter->validate(123));
-        $this->assertSame('123', $filter->validate('123'));
+        $this->assertSame(123, self::$filterInstance->validate(123));
+        $this->assertSame('123', self::$filterInstance->validate('123'));
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_valid_value(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame($optionsArray, $filter->getOptions());
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3']));
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame($optionsArray, self::$filterInstance->getOptions());
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3']));
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3', 2 => '99']));
     }
 
     public function test_can_get_if_filter_empty(): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(['all']));
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertFalse($filter->isEmpty([]));
-        $this->assertTrue($filter->isEmpty('123'));
-        $this->assertTrue($filter->isEmpty('test'));
-        $this->assertFalse($filter->isEmpty([1]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['all']));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertFalse(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty('123'));
+        $this->assertTrue(self::$filterInstance->isEmpty('test'));
+        $this->assertFalse(self::$filterInstance->isEmpty([1]));
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_first_option(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame('', $filter->getFirstOption());
-        $filter->setFirstOption('all');
-        $this->assertSame('all', $filter->getFirstOption());
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame('', self::$filterInstance->getFirstOption());
+        self::$filterInstance->setFirstOption('all');
+        $this->assertSame('all', self::$filterInstance->getFirstOption());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_check_if_can_set_default_value(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
+        self::$filterInstance->options($optionsArray);
 
-        $this->assertSame([], $filter->getFilterDefaultValue());
+        $this->assertSame([], self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(['1', '3']);
+        self::$filterInstance->setFilterDefaultValue(['1', '3']);
 
-        $this->assertSame(['1', '3'], $filter->getFilterDefaultValue());
+        $this->assertSame(['1', '3'], self::$filterInstance->getFilterDefaultValue());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_custom_filter_view(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame('livewire-tables::components.tools.filters.multi-select-dropdown', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame('livewire-tables::components.tools.filters.multi-select-dropdown', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_select_filter_wireable_live(array $optionsArray): void
     {
 
-        $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
+        self::$filterInstance->options($optionsArray);
 
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireBlur();
+        self::$filterInstance->setWireBlur();
 
-        $this->assertSame('blur', $filter->getWireableMethod());
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('blur', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireLive();
+        self::$filterInstance->setWireLive();
 
-        $this->assertSame('live', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDefer();
+        self::$filterInstance->setWireDefer();
 
-        $this->assertSame('defer', $filter->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('defer', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(250);
+        self::$filterInstance->setWireDebounce(250);
 
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(500);
+        self::$filterInstance->setWireDebounce(500);
 
-        $this->assertSame('live.debounce.500ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_separator(array $optionsArray): void
     {
-        $filter = MultiSelectDropdownFilter::make('Active')->options($optionsArray);
-        $this->assertSame(', ', $filter->getPillsSeparator());
-        $filter->setPillsSeparator('<br />');
-        $this->assertSame('<br />', $filter->getPillsSeparator());
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame(', ', self::$filterInstance->getPillsSeparator());
+        self::$filterInstance->setPillsSeparator('<br />');
+        $this->assertSame('<br />', self::$filterInstance->getPillsSeparator());
     }
 }
diff --git a/tests/Unit/Views/Filters/MultiSelectFilterTest.php b/tests/Unit/Views/Filters/MultiSelectFilterTest.php
index 3f1937947..022005621 100644
--- a/tests/Unit/Views/Filters/MultiSelectFilterTest.php
+++ b/tests/Unit/Views/Filters/MultiSelectFilterTest.php
@@ -4,13 +4,21 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
 
-final class MultiSelectFilterTest extends TestCase
+#[Group('Filters')]
+final class MultiSelectFilterTest extends FilterTestCase
 {
     public array $optionsArray = [];
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = MultiSelectFilter::make('Active');
+    }
+
     public function test_array_setup(): array
     {
         $this->optionsArray = $optionsArray = array_values(['Cartman', 'Tux', 'May', 'Ben', 'Chico']);
@@ -21,216 +29,191 @@ public function test_array_setup(): array
 
     public function test_can_get_filter_name(): void
     {
-        $filter = MultiSelectFilter::make('Active');
 
-        $this->assertSame('Active', $filter->getName());
+        $this->assertSame('Active', self::$filterInstance->getName());
     }
 
     public function test_can_get_filter_key(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame('active', $filter->getKey());
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertSame([], self::$filterInstance->getConfigs());
 
-        $this->assertSame([], $filter->getConfigs());
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $filter->config(['foo' => 'bar']);
+        $this->assertSame(['foo' => 'bar'], self::$filterInstance->getConfigs());
 
-        $this->assertSame(['foo' => 'bar'], $filter->getConfigs());
+        self::$filterInstance->config([]);
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame([], $filter->getDefaultValue());
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertFalse($filter->hasFilterCallback());
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('name', '=', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->setFilterPillTitle('User Status');
 
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasConfigs());
 
-        $this->assertFalse($filter->hasConfigs());
-
-        $filter = MultiSelectFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = MultiSelectFilter::make('Active')
-            ->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        self::$filterInstance->hiddenFromMenus();
 
-        $filter->hiddenFromMenus();
-
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $filter->hiddenFromPills();
+        self::$filterInstance->hiddenFromPills();
 
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = MultiSelectFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $filter->hiddenFromFilterCount();
-
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertTrue($filter->isResetByClearButton());
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $filter->notResetByClearButton();
+        self::$filterInstance->notResetByClearButton();
 
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_number(array $optionsArray): void
     {
-        $filter = MultiSelectFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame(123, $filter->validate(123));
-        $this->assertSame('123', $filter->validate('123'));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame(123, self::$filterInstance->validate(123));
+        $this->assertSame('123', self::$filterInstance->validate('123'));
     }
 
     #[Depends('test_array_setup')]
     public function test_can_set_filter_to_valid_value(array $optionsArray): void
     {
-        $filter = MultiSelectFilter::make('BreedID')->options($optionsArray);
-        $this->assertSame($optionsArray, $filter->getOptions());
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3']));
-        $this->assertSame(['1', '3'], $filter->validate([0 => '1', 1 => '3', 2 => '99']));
+        self::$filterInstance->options($optionsArray);
+        $this->assertSame($optionsArray, self::$filterInstance->getOptions());
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3']));
+        $this->assertSame(['1', '3'], self::$filterInstance->validate([0 => '1', 1 => '3', 2 => '99']));
     }
 
     public function test_can_get_if_filter_empty(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertTrue($filter->isEmpty([]));
-        $this->assertTrue($filter->isEmpty('123'));
-        $this->assertTrue($filter->isEmpty('test'));
-        $this->assertFalse($filter->isEmpty([1]));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertTrue(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty('123'));
+        $this->assertTrue(self::$filterInstance->isEmpty('test'));
+        $this->assertFalse(self::$filterInstance->isEmpty([1]));
     }
 
     public function test_can_set_custom_filter_view(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-        $this->assertSame('livewire-tables::components.tools.filters.multi-select', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        $this->assertSame('livewire-tables::components.tools.filters.multi-select', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 
     public function test_can_set_select_filter_wireable_live(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireBlur();
+        self::$filterInstance->setWireBlur();
 
-        $this->assertSame('blur', $filter->getWireableMethod());
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('blur', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireLive();
+        self::$filterInstance->setWireLive();
 
-        $this->assertSame('live', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDefer();
+        self::$filterInstance->setWireDefer();
 
-        $this->assertSame('defer', $filter->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('defer', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(250);
+        self::$filterInstance->setWireDebounce(250);
 
-        $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
-        $filter->setWireDebounce(500);
+        self::$filterInstance->setWireDebounce(500);
 
-        $this->assertSame('live.debounce.500ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
     }
 
     public function test_can_set_separator(): void
     {
-        $filter = MultiSelectFilter::make('Active');
-        $this->assertSame(', ', $filter->getPillsSeparator());
-        $filter->setPillsSeparator('<br />');
-        $this->assertSame('<br />', $filter->getPillsSeparator());
+        $this->assertSame(', ', self::$filterInstance->getPillsSeparator());
+        self::$filterInstance->setPillsSeparator('<br />');
+        $this->assertSame('<br />', self::$filterInstance->getPillsSeparator());
     }
 }
diff --git a/tests/Unit/Views/Filters/NumberFilterTest.php b/tests/Unit/Views/Filters/NumberFilterTest.php
index a97a93e35..141734038 100644
--- a/tests/Unit/Views/Filters/NumberFilterTest.php
+++ b/tests/Unit/Views/Filters/NumberFilterTest.php
@@ -3,190 +3,177 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter;
 
-final class NumberFilterTest extends TestCase
+#[Group('Filters')]
+final class NumberFilterTest extends FilterTestCase
 {
-    public function test_can_get_filter_name(): void
+    protected function setUp(): void
     {
-        $filter = NumberFilter::make('Active');
+        parent::setUp();
+        self::$filterInstance = NumberFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'max' => null,
+            'min' => null,
+            'placeholder' => null,
+            'type' => 'number',
+            'wire:key' => 'test123-filter-number-active',
+        ];
 
-        $this->assertSame('Active', $filter->getName());
     }
 
-    public function test_can_get_filter_key(): void
+    public function test_can_get_filter_name(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertSame('Active', self::$filterInstance->getName());
+    }
 
-        $this->assertSame('active', $filter->getKey());
+    public function test_can_get_filter_key(): void
+    {
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertSame([], self::$filterInstance->getConfigs());
 
-        $this->assertSame([], $filter->getConfigs());
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $filter->config(['foo' => 'bar']);
-
-        $this->assertSame(['foo' => 'bar'], $filter->getConfigs());
+        $this->assertSame(['foo' => 'bar'], self::$filterInstance->getConfigs());
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertNull($filter->getDefaultValue());
+        $this->assertNull(self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $this->assertFalse($filter->hasFilterCallback());
-
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, int $value) {
                 return $builder->where('breed_id', '>', $value);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $filter = NumberFilter::make('Active')
-            ->setFilterPillTitle('User Status');
+        self::$filterInstance->setFilterPillTitle('User Status');
 
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->hasConfigs());
 
-        $this->assertFalse($filter->hasConfigs());
-
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = NumberFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $filter->hiddenFromMenus();
+        self::$filterInstance->hiddenFromMenus();
 
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        self::$filterInstance->hiddenFromPills();
 
-        $filter->hiddenFromPills();
-
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $filter->hiddenFromFilterCount();
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = NumberFilter::make('Active');
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $this->assertTrue($filter->isResetByClearButton());
+        self::$filterInstance->notResetByClearButton();
 
-        $filter->notResetByClearButton();
-
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     public function test_can_not_set_number_filter_to_non_number(): void
     {
-        $filter = NumberFilter::make('BreedID');
-        $this->assertFalse($filter->validate('test'));
-        $this->assertFalse($filter->validate(['test']));
+        $this->assertFalse(self::$filterInstance->validate('test'));
+        $this->assertFalse(self::$filterInstance->validate(['test']));
     }
 
     public function test_can_set_number_filter_to_number(): void
     {
-        $filter = NumberFilter::make('BreedID');
-        $this->assertSame(123, $filter->validate(123));
-        $this->assertSame(123.51, $filter->validate(123.51));
-        $this->assertSame(123, $filter->validate('123'));
-        $this->assertSame(123.51, $filter->validate('123.51'));
+        $this->assertSame(123, self::$filterInstance->validate(123));
+        $this->assertSame(123.51, self::$filterInstance->validate(123.51));
+        $this->assertSame(123, self::$filterInstance->validate('123'));
+        $this->assertSame(123.51, self::$filterInstance->validate('123.51'));
 
     }
 
     public function test_can_get_if_number_filter_empty(): void
     {
-        $filter = NumberFilter::make('Active');
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertTrue($filter->isEmpty('q'));
-        $this->assertFalse($filter->isEmpty('123'));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertTrue(self::$filterInstance->isEmpty('q'));
+        $this->assertFalse(self::$filterInstance->isEmpty('123'));
     }
 
     public function test_can_check_if_can_set_default_value(): void
     {
-        $filter = NumberFilter::make('Active');
-
-        $this->assertNull($filter->getFilterDefaultValue());
+        $this->assertNull(self::$filterInstance->getFilterDefaultValue());
 
-        $filter->setFilterDefaultValue(123);
+        self::$filterInstance->setFilterDefaultValue(123);
 
-        $this->assertSame('123', $filter->getFilterDefaultValue());
+        $this->assertSame('123', self::$filterInstance->getFilterDefaultValue());
     }
 
     public function test_can_set_custom_filter_view(): void
     {
-        $filter = NumberFilter::make('Active');
-        $this->assertSame('livewire-tables::components.tools.filters.number', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        $this->assertSame('livewire-tables::components.tools.filters.number', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 }
diff --git a/tests/Unit/Views/Filters/NumberRangeFilterTest.php b/tests/Unit/Views/Filters/NumberRangeFilterTest.php
index b0790a1d0..b6e665032 100644
--- a/tests/Unit/Views/Filters/NumberRangeFilterTest.php
+++ b/tests/Unit/Views/Filters/NumberRangeFilterTest.php
@@ -3,223 +3,215 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\NumberRangeFilter;
 
-final class NumberRangeFilterTest extends TestCase
+#[Group('Filters')]
+final class NumberRangeFilterTest extends FilterTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::$filterInstance = NumberRangeFilter::make('Active');
+
+    }
+
     public function test_can_get_filter_name(): void
     {
-        $filter = NumberRangeFilter::make('Active');
         // Should Match
-        $this->assertSame('Active', $filter->getName());
+        $this->assertSame('Active', self::$filterInstance->getName());
     }
 
     public function test_can_get_filter_key(): void
     {
-        $filter = NumberRangeFilter::make('Active');
 
-        $this->assertSame('active', $filter->getKey());
+        $this->assertSame('active', self::$filterInstance->getKey());
     }
 
     public function test_can_get_filter_configs(): void
     {
-        $filter = NumberRangeFilter::make('Active');
 
         $defaultConfig = config('livewire-tables.numberRange.defaultConfig');
 
-        $this->assertSame($defaultConfig, $filter->getConfigs());
+        $this->assertSame($defaultConfig, self::$filterInstance->getConfigs());
 
-        $filter->config(['foo' => 'bar']);
+        self::$filterInstance->config(['foo' => 'bar']);
 
-        $this->assertSame(array_merge($defaultConfig, ['foo' => 'bar']), $filter->getConfigs());
+        $this->assertSame(array_merge($defaultConfig, ['foo' => 'bar']), self::$filterInstance->getConfigs());
     }
 
     public function test_get_a_single_filter_config(): void
     {
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getConfig('foo'));
+        $this->assertSame('bar', self::$filterInstance->getConfig('foo'));
     }
 
     public function test_can_get_if_empty(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertTrue($filter->isEmpty([]));
-        $this->assertTrue($filter->isEmpty(''));
-        $this->assertTrue($filter->isEmpty(['max' => 100]));
-        $this->assertTrue($filter->isEmpty(['min' => 0]));
-        $this->assertTrue($filter->isEmpty(['min' => '0']));
-        $this->assertTrue($filter->isEmpty(['min' => '0', 'max' => '']));
-        $this->assertTrue($filter->isEmpty(['min' => '0', 'max' => null]));
-        $this->assertTrue($filter->isEmpty(['min' => null, 'max' => null]));
-        $this->assertTrue($filter->isEmpty(['max' => null, 'min' => null]));
-        $this->assertTrue($filter->isEmpty(['max' => null, 'min' => '4']));
-        $this->assertTrue($filter->isEmpty(['min' => '62', 'max' => '']));
-        $this->assertTrue($filter->isEmpty(['min' => '', 'max' => '3']));
-        $this->assertTrue($filter->isEmpty(['min' => '', 'max' => '']));
-        $this->assertTrue($filter->isEmpty(['min' => 0, 'max' => 100]));
-        $this->assertFalse($filter->isEmpty(['min' => 0, 'max' => 50]));
-        $this->assertFalse($filter->isEmpty(['min' => '0', 'max' => 50]));
-        $this->assertFalse($filter->isEmpty(['min' => '0', 'max' => '50']));
-        $this->assertFalse($filter->isEmpty(['min' => '10', 'max' => '100']));
-        $this->assertFalse($filter->isEmpty(['min' => 10, 'max' => '100']));
+        $this->assertTrue(self::$filterInstance->isEmpty([]));
+        $this->assertTrue(self::$filterInstance->isEmpty(''));
+        $this->assertTrue(self::$filterInstance->isEmpty(['max' => 100]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => 0]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '0']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '0', 'max' => '']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '0', 'max' => null]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => null, 'max' => null]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['max' => null, 'min' => null]));
+        $this->assertTrue(self::$filterInstance->isEmpty(['max' => null, 'min' => '4']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '62', 'max' => '']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '', 'max' => '3']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => '', 'max' => '']));
+        $this->assertTrue(self::$filterInstance->isEmpty(['min' => 0, 'max' => 100]));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => 0, 'max' => 50]));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => '0', 'max' => 50]));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => '0', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => '10', 'max' => '100']));
+        $this->assertFalse(self::$filterInstance->isEmpty(['min' => 10, 'max' => '100']));
     }
 
     public function test_can_check_validation_accepts_valid_values(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertSame(['min' => 5, 'max' => 100], $filter->validate(['min' => '5', 'max' => '100']));
+        $this->assertSame(['min' => 5, 'max' => 100], self::$filterInstance->validate(['min' => '5', 'max' => '100']));
     }
 
     public function test_can_check_validation_rejects_invalid_values(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertFalse($filter->validate(['min' => '0', 'max' => 'set']));
-        $this->assertFalse($filter->validate(['min' => 'test', 'max' => '0']));
-        $this->assertFalse($filter->validate(['min' => 'test', 'max' => 'test']));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => '15', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '0', 'max' => 'set']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 'test', 'max' => '0']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 'test', 'max' => 'test']));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => '15', 'max' => '50']));
     }
 
     public function test_can_check_validation_rejects_missing_values(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertFalse($filter->validate(['min' => 10]));
-        $this->assertFalse($filter->validate(['min' => 10]));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => 15, 'max' => 50]));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 10]));
+        $this->assertFalse(self::$filterInstance->validate(['min' => 10]));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => 15, 'max' => 50]));
     }
 
     public function test_can_check_validation_rejects_values_over_configmax(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '15', 'max' => '5000']));
-        $this->assertFalse($filter->validate(['min' => '6', 'max' => '5000']));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => '15', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '15', 'max' => '5000']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '6', 'max' => '5000']));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => '15', 'max' => '50']));
     }
 
     public function test_can_check_validation_rejects_values_below_configmax(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '-46', 'max' => '50']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => '15', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-46', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => '15', 'max' => '50']));
     }
 
     public function test_can_check_validation_flips_values_min_larger_than_max(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '-46', 'max' => '50']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => '80', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-46', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => '80', 'max' => '50']));
     }
 
     public function test_can_check_validation_flips_values_max_smaller_than_min_orderflipped(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['min' => '146', 'max' => '50']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertFalse($filter->validate(['min' => '30', 'max' => '-5']));
-        $this->assertFalse($filter->validate(['min' => '30', 'max' => '125']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['min' => '146', 'max' => '50']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '30', 'max' => '-5']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '30', 'max' => '125']));
 
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['max' => '50', 'min' => '80']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['max' => '50', 'min' => '80']));
     }
 
     public function test_can_check_validation_fails_values_empty_string(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertFalse($filter->validate(['']));
-        $this->assertFalse($filter->validate(['min' => '-6', 'max' => '22']));
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => '80', 'max' => '50']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertFalse(self::$filterInstance->validate(['']));
+        $this->assertFalse(self::$filterInstance->validate(['min' => '-6', 'max' => '22']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => '80', 'max' => '50']));
     }
 
     public function test_can_check_validation_fails_values_null_values(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => 0, 'maxRange' => 100]);
-        $this->assertFalse($filter->validate(['min' => 22, 'max' => null]));
-        $this->assertFalse($filter->validate(['min' => null, 'max' => 22]));
-        $this->assertSame(['min' => 0, 'max' => 22], $filter->validate(['min' => '', 'max' => 22]));
-        $this->assertSame(['min' => 0, 'max' => 22], $filter->validate(['min' => '22', 'max' => '']));
+        self::$filterInstance->config(['minRange' => 0, 'maxRange' => 100]);
+        $this->assertFalse(self::$filterInstance->validate(['min' => 22, 'max' => null]));
+        $this->assertFalse(self::$filterInstance->validate(['min' => null, 'max' => 22]));
+        $this->assertSame(['min' => 0, 'max' => 22], self::$filterInstance->validate(['min' => '', 'max' => 22]));
+        $this->assertSame(['min' => 0, 'max' => 22], self::$filterInstance->validate(['min' => '22', 'max' => '']));
 
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => '80', 'max' => '50']));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => '80', 'max' => '50']));
     }
 
     public function test_filter_pill_values_can_be_set_for_numberrange(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '10', 'maxRange' => '100']);
+        self::$filterInstance->config(['minRange' => '10', 'maxRange' => '100']);
 
-        $this->assertEquals('Min:25, Max:50', $filter->getFilterPillValue(['min' => '25', 'max' => '50']));
-        $this->assertEquals('', $filter->getFilterPillValue(['min' => '30', 'max' => '166']));
-        $this->assertEquals('', $filter->getFilterPillValue(['min' => '5', 'max' => '53']));
-        $this->assertEquals('', $filter->getFilterPillValue(['min' => 'd0', 'max' => '76']));
+        $this->assertEquals('Min:25, Max:50', self::$filterInstance->getFilterPillValue(['min' => '25', 'max' => '50']));
+        $this->assertEquals('', self::$filterInstance->getFilterPillValue(['min' => '30', 'max' => '166']));
+        $this->assertEquals('', self::$filterInstance->getFilterPillValue(['min' => '5', 'max' => '53']));
+        $this->assertEquals('', self::$filterInstance->getFilterPillValue(['min' => 'd0', 'max' => '76']));
     }
 
     public function test_can_check_validation_fails_non_numeric_values(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => '0', 'maxRange' => '100']);
-        $this->assertSame(['min' => 0, 'max' => 48], $filter->validate(['min' => 0, 'max' => 48]));
-        $this->assertSame(['min' => 0, 'max' => 38], $filter->validate(['min' => 38, 'max' => 'test']));
+        self::$filterInstance->config(['minRange' => '0', 'maxRange' => '100']);
+        $this->assertSame(['min' => 0, 'max' => 48], self::$filterInstance->validate(['min' => 0, 'max' => 48]));
+        $this->assertSame(['min' => 0, 'max' => 38], self::$filterInstance->validate(['min' => 38, 'max' => 'test']));
 
-        $this->assertSame(['min' => 50, 'max' => 80], $filter->validate(['min' => 50, 'max' => 80]));
+        $this->assertSame(['min' => 50, 'max' => 80], self::$filterInstance->validate(['min' => 50, 'max' => 80]));
     }
 
     public function test_can_check_validation_rejects_values_fault_configs(): void
     {
-        $filter = NumberRangeFilter::make('Active')->config(['minRange' => 0, 'maxRange' => 100]);
-        $this->assertFalse($filter->validate(['min' => -6, 'max' => 2200]));
-        $this->assertSame(['min' => 15, 'max' => 50], $filter->validate(['min' => 15, 'max' => 50]));
+        self::$filterInstance->config(['minRange' => 0, 'maxRange' => 100]);
+        $this->assertFalse(self::$filterInstance->validate(['min' => -6, 'max' => 2200]));
+        $this->assertSame(['min' => 15, 'max' => 50], self::$filterInstance->validate(['min' => 15, 'max' => 50]));
     }
 
     public function test_can_get_filter_options(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertSame(config('livewire-tables.numberRange.defaultOptions'), self::$filterInstance->getOptions());
 
-        $this->assertSame(config('livewire-tables.numberRange.defaultOptions'), $filter->getOptions());
-
-        $filter->options(['foo' => 'bar']);
-        $this->assertSame(['min' => 0, 'max' => 100, 'foo' => 'bar'], $filter->getOptions());
+        self::$filterInstance->options(['foo' => 'bar']);
+        $this->assertSame(['min' => 0, 'max' => 100, 'foo' => 'bar'], self::$filterInstance->getOptions());
     }
 
     public function test_can_get_filter_keys(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertSame(['min', 'max'], $filter->getKeys());
+        $this->assertSame(['min', 'max'], self::$filterInstance->getKeys());
     }
 
     public function test_can_get_filter_default_value(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertSame([], $filter->getDefaultValue());
+        $this->assertSame([], self::$filterInstance->getDefaultValue());
     }
 
     public function test_can_get_filter_callback(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertFalse($filter->hasFilterCallback());
+        $this->assertFalse(self::$filterInstance->hasFilterCallback());
 
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->filter(function (Builder $builder, array $values) {
                 return $builder->where('breed_id', '>', $values['min'])
                     ->where('breed_id', '<', $values['max']);
             });
 
-        $this->assertTrue($filter->hasFilterCallback());
-        $this->assertIsCallable($filter->getFilterCallback());
+        $this->assertTrue(self::$filterInstance->hasFilterCallback());
+        $this->assertIsCallable(self::$filterInstance->getFilterCallback());
     }
 
     public function test_can_get_filter_pill_title(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertSame('Active', $filter->getFilterPillTitle());
+        $this->assertSame('Active', self::$filterInstance->getFilterPillTitle());
 
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->setFilterPillTitle('User Status');
 
-        $this->assertSame('User Status', $filter->getFilterPillTitle());
+        $this->assertSame('User Status', self::$filterInstance->getFilterPillTitle());
     }
 
     /*
@@ -228,13 +220,13 @@ public function test_can_get_filter_pill_value(): void
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => 'bar']);
 
-        $this->assertSame('bar', $filter->getFilterPillValue('foo'));
+        $this->assertSame('bar', self::$filterInstance->getFilterPillValue('foo'));
 
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => 'bar'])
             ->setFilterPillValues(['foo' => 'baz']);
 
-        $this->assertSame('baz', $filter->getFilterPillValue('foo'));
+        $this->assertSame('baz', self::$filterInstance->getFilterPillValue('foo'));
     }*/
 
     /*
@@ -243,91 +235,80 @@ public function test_can_get_nested_filter_pill_value(): void
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => ['bar' => 'baz']]);
 
-        $this->assertSame('baz', $filter->getFilterPillValue('bar'));
+        $this->assertSame('baz', self::$filterInstance->getFilterPillValue('bar'));
 
         $filter = NumberRangeFilter::make('Active')
             ->options(['foo' => ['bar' => 'baz']])
             ->setFilterPillValues(['bar' => 'etc']);
 
-        $this->assertSame('etc', $filter->getFilterPillValue('bar'));
+        $this->assertSame('etc', self::$filterInstance->getFilterPillValue('bar'));
     }*/
 
     public function test_can_check_if_filter_has_configs(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertTrue(self::$filterInstance->hasConfigs());
 
-        $this->assertTrue($filter->hasConfigs());
+        self::$filterInstance->config();
 
-        $filter->config();
-
-        $this->assertTrue($filter->hasConfigs());
+        $this->assertTrue(self::$filterInstance->hasConfigs());
 
     }
 
     public function test_can_check_filter_config_by_name(): void
     {
-        $filter = NumberRangeFilter::make('Active')
+        self::$filterInstance
             ->config(['foo' => 'bar']);
 
-        $this->assertTrue($filter->hasConfig('foo'));
-        $this->assertFalse($filter->hasConfig('bar'));
+        $this->assertTrue(self::$filterInstance->hasConfig('foo'));
+        $this->assertFalse(self::$filterInstance->hasConfig('bar'));
     }
 
     public function test_can_check_if_filter_is_hidden_from_menus(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromMenus());
+        $this->assertTrue(self::$filterInstance->isVisibleInMenus());
 
-        $this->assertFalse($filter->isHiddenFromMenus());
-        $this->assertTrue($filter->isVisibleInMenus());
+        self::$filterInstance->hiddenFromMenus();
 
-        $filter->hiddenFromMenus();
-
-        $this->assertTrue($filter->isHiddenFromMenus());
-        $this->assertFalse($filter->isVisibleInMenus());
+        $this->assertTrue(self::$filterInstance->isHiddenFromMenus());
+        $this->assertFalse(self::$filterInstance->isVisibleInMenus());
     }
 
     public function test_can_check_if_filter_is_hidden_from_pills(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertFalse($filter->isHiddenFromPills());
-        $this->assertTrue($filter->isVisibleInPills());
+        $this->assertFalse(self::$filterInstance->isHiddenFromPills());
+        $this->assertTrue(self::$filterInstance->isVisibleInPills());
 
-        $filter->hiddenFromPills();
+        self::$filterInstance->hiddenFromPills();
 
-        $this->assertTrue($filter->isHiddenFromPills());
-        $this->assertFalse($filter->isVisibleInPills());
+        $this->assertTrue(self::$filterInstance->isHiddenFromPills());
+        $this->assertFalse(self::$filterInstance->isVisibleInPills());
     }
 
     public function test_can_check_if_filter_is_hidden_from_count(): void
     {
-        $filter = NumberRangeFilter::make('Active');
+        $this->assertFalse(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertTrue(self::$filterInstance->isVisibleInFilterCount());
 
-        $this->assertFalse($filter->isHiddenFromFilterCount());
-        $this->assertTrue($filter->isVisibleInFilterCount());
+        self::$filterInstance->hiddenFromFilterCount();
 
-        $filter->hiddenFromFilterCount();
-
-        $this->assertTrue($filter->isHiddenFromFilterCount());
-        $this->assertFalse($filter->isVisibleInFilterCount());
+        $this->assertTrue(self::$filterInstance->isHiddenFromFilterCount());
+        $this->assertFalse(self::$filterInstance->isVisibleInFilterCount());
     }
 
     public function test_can_check_if_filter_is_reset_by_clear_button(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-
-        $this->assertTrue($filter->isResetByClearButton());
+        $this->assertTrue(self::$filterInstance->isResetByClearButton());
 
-        $filter->notResetByClearButton();
+        self::$filterInstance->notResetByClearButton();
 
-        $this->assertFalse($filter->isResetByClearButton());
+        $this->assertFalse(self::$filterInstance->isResetByClearButton());
     }
 
     public function test_can_set_custom_filter_view(): void
     {
-        $filter = NumberRangeFilter::make('Active');
-        $this->assertSame('livewire-tables::components.tools.filters.number-range', $filter->getViewPath());
-        $filter->setCustomView('test-custom-filter-view');
-        $this->assertSame('test-custom-filter-view', $filter->getViewPath());
+        $this->assertSame('livewire-tables::components.tools.filters.number-range', self::$filterInstance->getViewPath());
+        self::$filterInstance->setCustomView('test-custom-filter-view');
+        $this->assertSame('test-custom-filter-view', self::$filterInstance->getViewPath());
     }
 }
diff --git a/tests/Unit/Views/Filters/SelectFilterTest.php b/tests/Unit/Views/Filters/SelectFilterTest.php
index 9484c85b0..c95653019 100644
--- a/tests/Unit/Views/Filters/SelectFilterTest.php
+++ b/tests/Unit/Views/Filters/SelectFilterTest.php
@@ -3,8 +3,10 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 
+#[Group('Filters')]
 final class SelectFilterTest extends FilterTestCase
 {
     protected function setUp(): void
@@ -77,32 +79,32 @@ public function test_can_set_select_filter_wireable_live(): void
     {
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireBlur();
 
         $this->assertSame('blur', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.blur=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDefer();
 
         $this->assertSame('defer', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireLive();
         $this->assertSame('live', self::$filterInstance->getWireableMethod());
 
-        $this->assertSame('wire:model.live=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
         self::$filterInstance->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', self::$filterInstance->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', self::$filterInstance->getWireMethod('filterComponents.'.self::$filterInstance->getKey()));
 
     }
 }
diff --git a/tests/Unit/Views/Filters/TextFilterTest.php b/tests/Unit/Views/Filters/TextFilterTest.php
index 72bfd4d3e..28f2d49e1 100644
--- a/tests/Unit/Views/Filters/TextFilterTest.php
+++ b/tests/Unit/Views/Filters/TextFilterTest.php
@@ -3,14 +3,22 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
+#[Group('Filters')]
 final class TextFilterTest extends FilterTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
         self::$filterInstance = TextFilter::make('Active');
+        self::$extraFilterInputAttributes = [
+            'maxlength' => null,
+            'placeholder' => null,
+            'type' => 'text',
+            'wire:key' => 'test123-filter-text-active',
+        ];
     }
 
     public function test_can_get_filter_callback(): void
@@ -70,33 +78,33 @@ public function test_can_set_text_filter_wireable_live(): void
 
         $this->assertSame('blur', $filter->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireLive();
 
         $this->assertSame('live', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireDefer();
 
         $this->assertSame('defer', $filter->getWireableMethod());
-        $this->assertSame('wire:model=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireBlur();
 
         $this->assertSame('blur', $filter->getWireableMethod());
 
-        $this->assertSame('wire:model.blur=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.blur="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireDebounce(250);
 
         $this->assertSame('live.debounce.250ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.250ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.250ms="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
         $filter->setWireDebounce(500);
 
         $this->assertSame('live.debounce.500ms', $filter->getWireableMethod());
-        $this->assertSame('wire:model.live.debounce.500ms=filterComponents.active', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
+        $this->assertSame('wire:model.live.debounce.500ms="filterComponents.active"', $filter->getWireMethod('filterComponents.'.$filter->getKey()));
 
     }
 
diff --git a/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php b/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
index 2293446a7..6c3c590f2 100644
--- a/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
+++ b/tests/Unit/Views/Traits/Configuration/FilterConfigurationTest.php
@@ -2,9 +2,11 @@
 
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Configuration;
 
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 
+#[Group('Filters')]
 final class FilterConfigurationTest extends TestCase
 {
     public function test_filter_config_can_be_set(): void
diff --git a/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php b/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
index afe5deb3c..fb77abcac 100644
--- a/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
+++ b/tests/Unit/Views/Traits/Helpers/FilterHelpersTest.php
@@ -3,12 +3,14 @@
 namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Views\Traits\Helpers;
 
 use Illuminate\Database\Eloquent\Builder;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
+#[Group('Filters')]
 final class FilterHelpersTest extends TestCase
 {
     public function test_can_get_filter_name(): void
diff --git a/tests/Unit/Traits/Visuals/ActionsVisualsTest.php b/tests/Unit/Visuals/ActionsVisualsTest.php
similarity index 96%
rename from tests/Unit/Traits/Visuals/ActionsVisualsTest.php
rename to tests/Unit/Visuals/ActionsVisualsTest.php
index a0da08004..a0150f0f2 100644
--- a/tests/Unit/Traits/Visuals/ActionsVisualsTest.php
+++ b/tests/Unit/Visuals/ActionsVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class ActionsVisualsTest extends TestCase
 {
     public function test_can_align_actions_left(): void
diff --git a/tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php b/tests/Unit/Visuals/BulkActionsVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
rename to tests/Unit/Visuals/BulkActionsVisualsTest.php
index 8c2ebd6c3..32f0a57cc 100644
--- a/tests/Unit/Traits/Visuals/BulkActionsVisualsTest.php
+++ b/tests/Unit/Visuals/BulkActionsVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class BulkActionsVisualsTest extends TestCase
 {
     public function test_bulk_dropdown_shows_when_necessary(): void
diff --git a/tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php b/tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
similarity index 95%
rename from tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
rename to tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
index 746f8e039..21d1572a1 100644
--- a/tests/Unit/Traits/Visuals/Columns/IconColumnVisualsTest.php
+++ b/tests/Unit/Visuals/Columns/IconColumnVisualsTest.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals\Columns;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Columns;
 
 use Exception;
 use Illuminate\View\ViewException;
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\{BrokenSecondaryHeaderTable, NoBuildMethodTable, NoPrimaryKeyTable};
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class IconColumnVisualsTest extends TestCase
 {
     private $testErrors;
diff --git a/tests/Unit/Traits/Visuals/ComponentVisualsTest.php b/tests/Unit/Visuals/ComponentVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/ComponentVisualsTest.php
rename to tests/Unit/Visuals/ComponentVisualsTest.php
index d2eda3b8d..7b9ed0282 100644
--- a/tests/Unit/Traits/Visuals/ComponentVisualsTest.php
+++ b/tests/Unit/Visuals/ComponentVisualsTest.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Exception;
 use Illuminate\View\ViewException;
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\FailingTables\{BrokenSecondaryHeaderTable, NoBuildMethodTable, NoPrimaryKeyTable};
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable,PetsTableAttributes};
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class ComponentVisualsTest extends TestCase
 {
     private $testErrors;
diff --git a/tests/Unit/Traits/Visuals/FilterVisualsTest.php b/tests/Unit/Visuals/FilterVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/FilterVisualsTest.php
rename to tests/Unit/Visuals/FilterVisualsTest.php
index d55a00cb0..19b979437 100644
--- a/tests/Unit/Traits/Visuals/FilterVisualsTest.php
+++ b/tests/Unit/Visuals/FilterVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTableNoFilters;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class FilterVisualsTest extends TestCase
 {
     public function test_filters_button_shows_when_enabled(): void
diff --git a/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php b/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
new file mode 100644
index 000000000..644dfc33c
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/BooleanFilterVisualsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\BooleanFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class BooleanFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_set_custom_attributes_on_boolean_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    BooleanFilter::make('Boolfilter')
+                        ->setInputAttributes([
+                            'blobColor' => 'bg-green-500',
+                            'activeColor' => 'bg-red-500',
+                            'inactiveColor' => 'bg-blue-500',
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<span :class="(value == 1 || value == true) ? \'translate-x-[18px]\' : \'translate-x-0.5\'" class="w-5 h-5 duration-200 ease-in-out rounded-full shadow-md bg-green-500"></span>')
+            ->assertSeeHtml('<button x-cloak class="relative inline-flex h-6 py-0.5 ml-4 focus:outline-none rounded-full w-10" :class="(value == 1 || value == true) ? &#039;bg-red-500&#039; : &#039;bg-blue-500&#039;" @click="toggleStatusWithUpdate" id="table-filter-boolfilter" type="button" x-ref="switchButton">');
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php b/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
new file mode 100644
index 000000000..85c7ac153
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/DateFilterVisualsTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class DateFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_use_default_attributes_on_date_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateFilter::make('Datefilter'),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300  focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datefilter" type="date" wire:key="table-filter-date-datefilter" />');
+    }
+
+    public function test_can_set_custom_attributes_on_date_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateFilter::make('Datefilter')
+                        ->setInputAttributes([
+                            'min' => '01/01/2024',
+                            'max' => '12/12/2024',
+                            'default-colors' => true,
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300  focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datefilter" max="12/12/2024" min="01/01/2024" type="date" wire:key="table-filter-date-datefilter" />');
+
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php b/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
new file mode 100644
index 000000000..3172f8b60
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/DateTimeFilterVisualsTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class DateTimeFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_use_default_attributes_on_datetime_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateTimeFilter::make('Datetimefilter'),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datetimefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datetimefilter" type="datetime-local" wire:key="table-filter-datetime-datetimefilter" />');
+    }
+
+    public function test_can_set_custom_attributes_on_datetime_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    DateTimeFilter::make('Datetimefilter')
+                        ->setInputAttributes([
+                            'min' => '01/01/2024',
+                            'max' => '12/12/2024',
+                            'default-colors' => true,
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.live="filterComponents.datetimefilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-datetimefilter" max="12/12/2024" min="01/01/2024" type="datetime-local" wire:key="table-filter-datetime-datetimefilter" />');
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php b/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
new file mode 100644
index 000000000..78a65b93c
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/FilterVisualsTestCase.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Tests\TestCase;
+
+abstract class FilterVisualsTestCase extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        parent::setupBreedsTable();
+    }
+}
diff --git a/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php b/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
new file mode 100644
index 000000000..ac8df3b50
--- /dev/null
+++ b/tests/Unit/Visuals/Filters/NumberFilterVisualsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
+
+use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
+use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
+use Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter;
+
+#[Group('Visuals')]
+#[Group('Filters')]
+final class NumberFilterVisualsTest extends FilterVisualsTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_can_set_custom_attributes_on_number_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    NumberFilter::make('Numberfilter')
+                        ->setInputAttributes([
+                            'min' => '20',
+                            'max' => '100',
+                            'steps' => '0.5',
+                            'default-colors' => true,
+                            'default-styling' => true,
+                        ]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.blur="filterComponents.numberfilter" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600" id="table-filter-numberfilter" max="100" min="20" steps="0.5" type="number" wire:key="table-filter-number-numberfilter" />');
+
+    }
+}
diff --git a/tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php b/tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
similarity index 88%
rename from tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
rename to tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
index 6a89e48ef..7b12c22d3 100644
--- a/tests/Unit/Traits/Visuals/Filters/TextFilterVisualsTest.php
+++ b/tests/Unit/Visuals/Filters/TextFilterVisualsTest.php
@@ -1,18 +1,20 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals\Filters;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals\Filters;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\BreedsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 use Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter;
 
-final class TextFilterVisualsTest extends TestCase
+#[Group('Visuals')]
+#[Group('Filters')]
+final class TextFilterVisualsTest extends FilterVisualsTestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        parent::setupBreedsTable();
     }
 
     public function test_can_use_endswith_method(): void
@@ -308,4 +310,26 @@ public function filters(): array
             ->assertDontSee('Maine Coon')
             ->assertSee('Persian');
     }
+
+    public function test_can_set_custom_attributes_on_text_filter(): void
+    {
+
+        Livewire::test(new class extends BreedsTable
+        {
+            public function configure(): void
+            {
+                $this->setPrimaryKey('id');
+            }
+
+            public function filters(): array
+            {
+                return [
+                    TextFilter::make('name')
+                        ->setInputAttributes(['maxlength' => 75, 'class' => 'bg-red-500', 'default-styling' => true]),
+                ];
+            }
+        })
+            ->assertSeeHtml('<input wire:model.blur="filterComponents.name" class="block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50 bg-red-500" id="table-filter-name" maxlength="75" type="text" wire:key="table-filter-text-name" />');
+
+    }
 }
diff --git a/tests/Unit/Traits/Visuals/HideableTableTest.php b/tests/Unit/Visuals/HideableTableTest.php
similarity index 93%
rename from tests/Unit/Traits/Visuals/HideableTableTest.php
rename to tests/Unit/Visuals/HideableTableTest.php
index 06cf02db7..b5793dd8d 100644
--- a/tests/Unit/Traits/Visuals/HideableTableTest.php
+++ b/tests/Unit/Visuals/HideableTableTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class HideableTableTest extends TestCase
 {
     public function test_can_see_table_by_default(): void
diff --git a/tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php b/tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
similarity index 93%
rename from tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
rename to tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
index ad8923dad..34a1c36de 100644
--- a/tests/Unit/Traits/Visuals/LoadingPlaceholderVisualsTest.php
+++ b/tests/Unit/Visuals/LoadingPlaceholderVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTableLoadingPlaceholder;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class LoadingPlaceholderVisualsTest extends TestCase
 {
     public function test_can_see_placeholder_section(): void
diff --git a/tests/Unit/Traits/Visuals/PaginationVisualsTest.php b/tests/Unit/Visuals/PaginationVisualsTest.php
similarity index 99%
rename from tests/Unit/Traits/Visuals/PaginationVisualsTest.php
rename to tests/Unit/Visuals/PaginationVisualsTest.php
index 1d4226e78..668259f88 100644
--- a/tests/Unit/Traits/Visuals/PaginationVisualsTest.php
+++ b/tests/Unit/Visuals/PaginationVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\{PetsTable};
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class PaginationVisualsTest extends TestCase
 {
     public function test_pagination_shows_by_default(): void
diff --git a/tests/Unit/Traits/Visuals/RefreshVisualsTest.php b/tests/Unit/Visuals/RefreshVisualsTest.php
similarity index 90%
rename from tests/Unit/Traits/Visuals/RefreshVisualsTest.php
rename to tests/Unit/Visuals/RefreshVisualsTest.php
index ee0f7944a..9ed0890a8 100644
--- a/tests/Unit/Traits/Visuals/RefreshVisualsTest.php
+++ b/tests/Unit/Visuals/RefreshVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class RefreshVisualsTest extends TestCase
 {
     public function test_refresh_shows_no_poll_by_default(): void
diff --git a/tests/Unit/Traits/Visuals/ReorderingVisualsTest.php b/tests/Unit/Visuals/ReorderingVisualsTest.php
similarity index 99%
rename from tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
rename to tests/Unit/Visuals/ReorderingVisualsTest.php
index 5ee1071aa..20e5b08af 100644
--- a/tests/Unit/Traits/Visuals/ReorderingVisualsTest.php
+++ b/tests/Unit/Visuals/ReorderingVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class ReorderingVisualsTest extends TestCase
 {
     public function test_filter_array_setup(): array
diff --git a/tests/Unit/Traits/Visuals/SearchVisualsTest.php b/tests/Unit/Visuals/SearchVisualsTest.php
similarity index 97%
rename from tests/Unit/Traits/Visuals/SearchVisualsTest.php
rename to tests/Unit/Visuals/SearchVisualsTest.php
index c64876e32..4d56ee213 100644
--- a/tests/Unit/Traits/Visuals/SearchVisualsTest.php
+++ b/tests/Unit/Visuals/SearchVisualsTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class SearchVisualsTest extends TestCase
 {
     public function test_search_shows_be_default(): void
diff --git a/tests/Unit/Traits/Visuals/SortingVisualsTest.php b/tests/Unit/Visuals/SortingVisualsTest.php
similarity index 98%
rename from tests/Unit/Traits/Visuals/SortingVisualsTest.php
rename to tests/Unit/Visuals/SortingVisualsTest.php
index 6e0bb79f4..6a6333445 100644
--- a/tests/Unit/Traits/Visuals/SortingVisualsTest.php
+++ b/tests/Unit/Visuals/SortingVisualsTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Visuals;
+namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Visuals;
 
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use Rappasoft\LaravelLivewireTables\Tests\Http\Livewire\PetsTable;
 use Rappasoft\LaravelLivewireTables\Tests\TestCase;
 
+#[Group('Visuals')]
 final class SortingVisualsTest extends TestCase
 {
     public array $default10 = [];