diff --git a/composer.json b/composer.json
index 0f15dda..5fb269b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,9 @@
         "laravel/framework":"~5.1|6.*|7.*|8.*|9.*|10.*"
     },
     "autoload-dev": {
-        "classmap": ["tests/TestCase.php"]
+        "psr-4": {
+            "Tests\\": "tests"
+        }
     },
     "require-dev": {
         "orchestra/testbench": "~3.0|~4.0|~5.0|~6.0|~7.0|~8.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8369c88..9aac3a2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,40 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        backupGlobals="false"
+        bootstrap="vendor/autoload.php"
+        colors="true"
+        processIsolation="false"
+        beStrictAboutTestsThatDoNotTestAnything="false"
+        stopOnError="false"
+        stopOnFailure="false"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+        cacheDirectory=".phpunit.cache"
+        backupStaticProperties="false"
 >
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-    </php>
-    <logging>
-        <log type="coverage-html" target="./log/codeCoverage" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="50" highLowerBound="80"/>
-        <log type="testdox-html" target="./log/testdox.html" />
-    </logging>
-    <filter>
-
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src/Utils</directory>
-        </whitelist>
-
-        <blacklist>
-            <directory>./src/vendor</directory>
-        </blacklist>
-    </filter>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+  </php>
 </phpunit>
diff --git a/src/Utils/WidgetJsonifier.php b/src/Utils/WidgetJsonifier.php
index e7638ef..23a4e0b 100644
--- a/src/Utils/WidgetJsonifier.php
+++ b/src/Utils/WidgetJsonifier.php
@@ -34,7 +34,9 @@ public function jsonResponse($widget, ...$args)
      */
     private function makeWidgetObj(string $widget)
     {
-        $widget = app()->getNamespace().'Widgets\\'.$widget;
+        if ($widget[0] !== '\\') {
+            $widget = app()->getNamespace().'Widgets\\'.$widget;
+        }
 
         return app($widget);
     }
diff --git a/tests/SlotWidgetTest.php b/tests/SlotWidgetTest.php
index f72554e..b770306 100644
--- a/tests/SlotWidgetTest.php
+++ b/tests/SlotWidgetTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace Tests;
+
 use Illuminate\Support\Facades\View;
 use Imanghafoori\Widgets\Utils\WidgetRenderer;
 
-require_once 'test_stubs.php';
 
 class SlotWidgetTest extends TestCase
 {
@@ -76,8 +77,8 @@ public function test_widget_with_a_slot()
         ob_end_clean();
 
         //act
-        $widget = new Widget4();
-        $widget->controller = 'Widget4Ctrl@meta';
+        $widget = new Widget4Slot();
+        $widget->controller = 'Tests\Widget764Ctrl@meta';
         $renderer->renderWidget($widget, ['arg1' => 'a', 'arg2' => 'bb']);
     }
 
@@ -103,8 +104,27 @@ public function test_widget_with_many_slots()
         }
 
         //act
-        $widget = new Widget4();
-        $widget->controller = 'Widget4Ctrl@meta';
+        $widget = new Widget4Slot();
+        $widget->controller = 'Tests\Widget764Ctrl@meta';
         $renderer->renderWidget($widget, ['arg1' => 'a', 'arg2' => 'bb']);
     }
 }
+
+class Widget4Slot
+{
+    public $template = 'hello';
+    public $controller = 'Widget764Ctrl';
+}
+
+class Widget764Ctrl
+{
+    public function data($arg1, $arg2)
+    {
+        return $arg1.$arg2;
+    }
+
+    public function meta($arg1, $arg2)
+    {
+        return $arg2.$arg1.$arg1;
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 9b0d287..699ace4 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,6 +1,8 @@
 <?php
 
-abstract class TestCase extends Orchestra\Testbench\TestCase
+namespace Tests;
+
+class TestCase extends \Orchestra\Testbench\TestCase
 {
     protected function getPackageProviders($app)
     {
diff --git a/tests/WidgetCacheTest.php b/tests/WidgetCacheTest.php
index a1cae9a..cdd1fcd 100644
--- a/tests/WidgetCacheTest.php
+++ b/tests/WidgetCacheTest.php
@@ -1,6 +1,10 @@
 <?php
 
-require_once 'test_stubs.php';
+namespace Tests;
+
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Cache;
+
 
 class WidgetCacheTest extends TestCase
 {
@@ -18,7 +22,7 @@ public function test_the_view_and_controller_are_rendered_only_once_when_cache_i
         \App::shouldReceive('call')->once()->andReturn('foo');
 
         //act
-        $widget = new Widget1();
+        $widget = new Widget123();
         $result1 = render_widget($widget);
         $result2 = render_widget($widget);
         $result3 = render_widget($widget);
@@ -67,7 +71,7 @@ public function test_caches_the_result_of_controller_method_and_views()
         View::shouldReceive('exists')->once()->andReturn(true);
 
         //act
-        $widget = new Widget1();
+        $widget = new Widget123();
         $result1 = render_widget($widget);
         $result2 = render_widget($widget);
         $result3 = render_widget($widget);
@@ -196,7 +200,7 @@ public function test_the_view_and_controller_are_rendered_only_once_when_cache_i
         \App::shouldReceive('call')->times(5)->andReturn('foo');
 
         //act
-        $widget = new Widget1();
+        $widget = new Widget123();
         $result1 = render_widget($widget);
         $result2 = render_widget($widget);
         $widget->cacheView = false;
@@ -210,3 +214,78 @@ public function test_the_view_and_controller_are_rendered_only_once_when_cache_i
         $this->assertEquals($widget->cacheLifeTime->s, 1);
     }
 }
+
+class ForeverWidget
+{
+    public $cacheLifeTime = -1;
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+}
+
+class ForeverWidget2
+{
+    public $cacheLifeTime = 'forever';
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+}
+
+class CustomCacheKeyWidget
+{
+    public $cacheLifeTime = -1;
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+
+    public function cacheKey()
+    {
+        return 'abcde';
+    }
+}
+
+class TaggedWidget
+{
+    public $template = 'hello';
+    public $cacheTags = ['t1', 't2'];
+
+    public function data()
+    {
+    }
+}
+
+class Widget123
+{
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+}
+
+class Widget8
+{
+    public $template = 'hello';
+
+    public $cacheView = false;
+
+    public function data()
+    {
+    }
+}
+
+class ZeroLifeTimeWidget
+{
+    public $cacheLifeTime = 0;
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+}
\ No newline at end of file
diff --git a/tests/WidgetMinificationTest.php b/tests/WidgetMinificationTest.php
index 7669d20..48510be 100644
--- a/tests/WidgetMinificationTest.php
+++ b/tests/WidgetMinificationTest.php
@@ -1,6 +1,9 @@
 <?php
 
-require_once 'test_stubs.php';
+namespace Tests;
+
+use Illuminate\Support\Facades\View;
+
 
 class WidgetMinificationTest extends TestCase
 {
@@ -83,3 +86,13 @@ public function test_minifies_the_output_in_production_with_cache_turned_off()
         $this->assertEquals($minified, $html);
     }
 }
+
+
+class Widget7
+{
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+}
\ No newline at end of file
diff --git a/tests/WidgetTest.php b/tests/WidgetTest.php
index ac3c130..db692df 100644
--- a/tests/WidgetTest.php
+++ b/tests/WidgetTest.php
@@ -1,6 +1,9 @@
 <?php
 
-require_once 'test_stubs.php';
+namespace Tests;
+
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Response;
 
 class WidgetTest extends TestCase
 {
@@ -18,12 +21,12 @@ public function test_presenter_method_is_called_with_data_from_controller()
     public function test_default_view_name_is_figured_out_correctly()
     {
         View::shouldReceive('exists')->once()->andReturn(true);
-        View::shouldReceive('make')->once()->with('Widgets::Foo.Widget1View', ['data' => 'foo', 'params' => null], [])->andReturn(app('view'));
+        View::shouldReceive('make')->once()->with('Widgets::Tests.Widget1View', ['data' => 'foo', 'params' => null], [])->andReturn(app('view'));
         View::shouldReceive('render')->once()->andReturn('<br>');
         \App::shouldReceive('call')->once()->andReturn('foo');
 
         //act
-        $widget = new \App\Widgets\Foo\Widget1();
+        $widget = new Widget1();
         render_widget($widget);
     }
 
@@ -58,7 +61,7 @@ public function test_controller_method_is_called_on_some_other_class_2()
 
         //act
         $widget = new Widget4();
-        $widget->controller = 'Widget4Ctrl@meta';
+        $widget->controller = 'Tests\Widget4Ctrl@meta';
         render_widget($widget, ['arg1' => 'a', 'arg2' => 'bb']);
     }
 
@@ -90,7 +93,7 @@ public function test_data_is_passed_to_data_method_from_view_as_string()
         View::shouldReceive('make')->once()->with('hello', ['data' => '222111', 'params' => ['foo' => '111', 'bar' => '222']], [])->andReturn(app('view'));
         View::shouldReceive('render')->once()->andReturn('<br>');
         //act
-        render_widget('Foo\Widget6', ['foo' => '111', 'bar' => '222']);
+        render_widget('\Tests\Widget6', ['foo' => '111', 'bar' => '222']);
     }
 
     public function test_json_widgets()
@@ -108,7 +111,94 @@ public function test_json_widgets_as_string()
         Response::shouldReceive('json')->once()->with('222111', 200)->andReturn('123');
         View::shouldReceive('exists')->once()->andReturn(true);
         //act
-        $a = json_widget('Foo\Widget6', ['foo' => '111', 'bar' => '222']);
+        $a = json_widget('\Tests\Widget6', ['foo' => '111', 'bar' => '222']);
         $this->assertEquals('123', $a);
     }
 }
+
+
+class Widget6
+{
+    public $template = 'hello';
+
+    public function data($foo, $bar)
+    {
+        return $bar.$foo;
+    }
+}
+
+class Widget5
+{
+    public $template = 'hello';
+    public $presenter = 'Tests\Widget5Presenter';
+
+    public function data()
+    {
+        return 'foo';
+    }
+}
+
+class Widget4
+{
+    public $template = 'hello';
+    public $controller = 'Tests\Widget4Ctrl';
+}
+
+class Widget13
+{
+    public $template = 'hello';
+
+    public function data()
+    {
+    }
+}
+
+
+class Widget66
+{
+    public $template = 'hello';
+
+    public function data($foo, $bar)
+    {
+        return $bar.$foo;
+    }
+}
+
+class Widget4Ctrl
+{
+    public function data($arg1, $arg2)
+    {
+        return $arg1.$arg2;
+    }
+
+    public function meta($arg1, $arg2)
+    {
+        return $arg2.$arg1.$arg1;
+    }
+}
+
+class Widget3
+{
+    public $template = 'hello';
+    public $contextAs = '$myData';
+
+    public function data()
+    {
+    }
+}
+
+class Widget1
+{
+    public function data()
+    {
+    }
+}
+
+
+class Widget5Presenter
+{
+    public function present($data)
+    {
+        return 'bar'.$data;
+    }
+}
\ No newline at end of file
diff --git a/tests/test_stubs.php b/tests/test_stubs.php
deleted file mode 100644
index 39c359d..0000000
--- a/tests/test_stubs.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-namespace App\Widgets\Foo {
-    class Widget1
-    {
-        public function data()
-        {
-        }
-    }
-
-    class Widget6
-    {
-        public $template = 'hello';
-
-        public function data($foo, $bar)
-        {
-            return $bar.$foo;
-        }
-    }
-}
-
-namespace {
-    class ForeverWidget
-    {
-        public $cacheLifeTime = -1;
-        public $template = 'hello';
-
-        public function data()
-        {
-        }
-    }
-    class ZeroLifeTimeWidget
-    {
-        public $cacheLifeTime = 0;
-        public $template = 'hello';
-
-        public function data()
-        {
-        }
-    }
-
-    class CustomCacheKeyWidget
-    {
-        public $cacheLifeTime = -1;
-        public $template = 'hello';
-
-        public function data()
-        {
-        }
-
-        public function cacheKey()
-        {
-            return 'abcde';
-        }
-    }
-
-    class ForeverWidget2
-    {
-        public $cacheLifeTime = 'forever';
-        public $template = 'hello';
-
-        public function data()
-        {
-        }
-    }
-
-    class Widget1
-    {
-        public $template = 'hello';
-
-        public function data()
-        {
-        }
-    }
-
-    class TaggedWidget
-    {
-        public $template = 'hello';
-        public $cacheTags = ['t1', 't2'];
-
-        public function data()
-        {
-        }
-    }
-
-    class Widget2
-    {
-        public function data()
-        {
-        }
-    }
-
-    class Widget3
-    {
-        public $template = 'hello';
-        public $contextAs = '$myData';
-
-        public function data()
-        {
-        }
-    }
-
-    class Widget4
-    {
-        public $template = 'hello';
-        public $controller = 'Widget4Ctrl';
-    }
-
-    class Widget4Ctrl
-    {
-        public function data($arg1, $arg2)
-        {
-            return $arg1.$arg2;
-        }
-
-        public function meta($arg1, $arg2)
-        {
-            return $arg2.$arg1.$arg1;
-        }
-    }
-
-    class Widget5
-    {
-        public $template = 'hello';
-        public $presenter = 'Widget5Presenter';
-
-        public function data()
-        {
-            return 'foo';
-        }
-    }
-
-    class Widget5Presenter
-    {
-        public function present($data)
-        {
-            return 'bar'.$data;
-        }
-    }
-
-    class Widget6
-    {
-        public $template = 'hello';
-
-        public function data($foo, $bar)
-        {
-            return $bar.$foo;
-        }
-    }
-
-    class Widget7
-    {
-        public $template = 'hello';
-
-        public function data()
-        {
-        }
-    }
-
-    class Widget8
-    {
-        public $template = 'hello';
-
-        public $cacheView = false;
-
-        public function data()
-        {
-        }
-    }
-}