diff --git a/tests/ConfigFunctionTest.php b/tests/ConfigFunctionTest.php
index 5255494..d615aa3 100644
--- a/tests/ConfigFunctionTest.php
+++ b/tests/ConfigFunctionTest.php
@@ -8,7 +8,7 @@
  * @author  Korotkov Danila (Jagepard) <jagepard@yandex.ru>
  * @license https://mozilla.org/MPL/2.0/  MPL-2.0
  * 
- * phpunit src/tests/ContainerTest --coverage-html src/tests/coverage-html
+ * phpunit src/tests/ConfigFunctionTest --coverage-html src/tests/coverage-html
  */
 
 namespace Rudra\Container\Tests;
diff --git a/tests/CookieTest.php b/tests/CookieTest.php
index e292504..d692b38 100644
--- a/tests/CookieTest.php
+++ b/tests/CookieTest.php
@@ -8,7 +8,7 @@
  * @author  Korotkov Danila (Jagepard) <jagepard@yandex.ru>
  * @license https://mozilla.org/MPL/2.0/  MPL-2.0
  * 
- * phpunit src/tests/ContainerTest --coverage-html src/tests/coverage-html
+ * phpunit src/tests/CookieTest --coverage-html src/tests/coverage-html
  */
 
 namespace Rudra\Container\Tests;
diff --git a/tests/DataFunctionTest.php b/tests/DataFunctionTest.php
index 9bbe108..0956b33 100644
--- a/tests/DataFunctionTest.php
+++ b/tests/DataFunctionTest.php
@@ -8,7 +8,7 @@
  * @author  Korotkov Danila (Jagepard) <jagepard@yandex.ru>
  * @license https://mozilla.org/MPL/2.0/  MPL-2.0
  * 
- * phpunit src/tests/ContainerTest --coverage-html src/tests/coverage-html
+ * phpunit src/tests/DataFunctionTest --coverage-html src/tests/coverage-html
  */
 
 namespace Rudra\Container\Tests;
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index a9e78ba..f931388 100644
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -8,7 +8,7 @@
  * @author  Korotkov Danila (Jagepard) <jagepard@yandex.ru>
  * @license https://mozilla.org/MPL/2.0/  MPL-2.0
  * 
- * phpunit src/tests/ContainerTest --coverage-html src/tests/coverage-html
+ * phpunit src/tests/RequestTest --coverage-html src/tests/coverage-html
  */
 
 namespace Rudra\Container\Tests;
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index 9bdf027..f8ff83c 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -8,7 +8,7 @@
  * @author  Korotkov Danila (Jagepard) <jagepard@yandex.ru>
  * @license https://mozilla.org/MPL/2.0/  MPL-2.0
  * 
- * phpunit src/tests/ContainerTest --coverage-html src/tests/coverage-html
+ * phpunit src/tests/ResponseTest --coverage-html src/tests/coverage-html
  */
 
 namespace Rudra\Container\Tests;
diff --git a/tests/RudraTest.php b/tests/RudraTest.php
index 97cb988..265e759 100755
--- a/tests/RudraTest.php
+++ b/tests/RudraTest.php
@@ -14,24 +14,20 @@
 namespace Rudra\Container\Tests;
 
 use Rudra\Container\Container;
-use Rudra\Container\Rudra as R;
-use Rudra\Container\Facades\{Cookie, Request, Response, Rudra, Session};
+use Rudra\Container\Facades\Rudra;
 use Rudra\Container\Interfaces\RudraInterface;
-use Rudra\Container\Tests\Stub\{
-    BindingClass, 
-    BindingClassStub, 
-    ClassWithDependency,
-    ClassWithoutParameters,
-    ClassWithoutConstructor,
-    ClassWithDefaultParameters,
-};
-use Rudra\Exceptions\NotFoundException;
+use Rudra\Container\Rudra as R;
+use Rudra\Container\Tests\Stub\BindingClass;
+use Rudra\Container\Tests\Stub\BindingClassStub;
+use Rudra\Container\Tests\Stub\ClassWithDefaultParameters;
+use Rudra\Container\Tests\Stub\ClassWithDependency;
+use Rudra\Container\Tests\Stub\ClassWithoutConstructor;
+use Rudra\Container\Tests\Stub\ClassWithoutParameters;
 use Rudra\Container\Tests\Stub\Factories\BindingFactory;
 use Rudra\Container\Tests\Stub\Interfaces\BindInterface;
-use PHPUnit\Framework\{TestCase as PHPUnit_Framework_TestCase};
-use Rudra\Container\Tests\Stub\Factories\BindingFactoryString;
+use Rudra\Exceptions\NotFoundException;
 
-class RudraTest extends PHPUnit_Framework_TestCase
+class RudraTest extends \PHPUnit\Framework\TestCase
 {
     private RudraInterface $rudra;
 
diff --git a/tests/SessionTest.php b/tests/SessionTest.php
index 3b3ac9a..42e0c9f 100644
--- a/tests/SessionTest.php
+++ b/tests/SessionTest.php
@@ -8,14 +8,15 @@
  * @author  Korotkov Danila (Jagepard) <jagepard@yandex.ru>
  * @license https://mozilla.org/MPL/2.0/  MPL-2.0
  * 
- * phpunit src/tests/ContainerTest --coverage-html src/tests/coverage-html
+ * phpunit src/tests/SessionTest --coverage-html src/tests/coverage-html
  */
 
 namespace Rudra\Container\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Rudra\Container\Facades\Rudra;
+use Rudra\Container\Facades\Session;
 use Rudra\Exceptions\NotFoundException;
-use Rudra\Container\Facades\{Cookie, Request, Response, Rudra, Session};
 
 class SessionTest extends TestCase
 {