diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index f1c7794..75c26d6 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -396,7 +396,7 @@ final class ApiController extends Controller
         $appManager = new ApplicationManager($this->app->moduleManager);
 
         $app = $request->getData('appSrc');
-        if (!\file_exists(__DIR__ . '/../../../' . $app)) {
+        if (!\is_dir(__DIR__ . '/../../../' . $app)) {
             $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
             return;
         }
@@ -425,11 +425,11 @@ final class ApiController extends Controller
      */
     public function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
-        if (\file_exists(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) {
+        if (\is_dir(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) {
             Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css');
         }
 
-        if (\file_exists(__DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css')) {
+        if (\is_dir(__DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css')) {
             Directory::copy(
                 __DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css',
                 __DIR__ . '/../../../' . $request->getData('appDest') . '/css',
@@ -1363,21 +1363,21 @@ final class ApiController extends Controller
 
         if ($directories !== false) {
             foreach ($directories as $directory) {
-                if (\file_exists($path = $directory . '/Routes.php')) {
+                if (\is_file($path = $directory . '/Routes.php')) {
                     \file_put_contents($path, '<?php return [];');
                 }
 
-                if (\file_exists($path = $directory . '/Hooks.php')) {
+                if (\is_file($path = $directory . '/Hooks.php')) {
                     \file_put_contents($path, '<?php return [];');
                 }
             }
         }
 
-        if (\file_exists($path = __DIR__ . '/../../../Console/Routes.php')) {
+        if (\is_file($path = __DIR__ . '/../../../Console/Routes.php')) {
             \file_put_contents($path, '<?php return [];');
         }
 
-        if (\file_exists($path = __DIR__ . '/../../../Socket/Routes.php')) {
+        if (\is_file($path = __DIR__ . '/../../../Socket/Routes.php')) {
             \file_put_contents($path, '<?php return [];');
         }
 
@@ -1423,9 +1423,9 @@ final class ApiController extends Controller
             $name = \explode('_', $file['name']);
             $path = '';
 
-            if (\file_exists(__DIR__ . '/../../../' . $name[0])) {
+            if (\is_dir(__DIR__ . '/../../../' . $name[0])) {
                 $path = __DIR__ . '/../../../' . $name[0];
-            } elseif (\file_exists(__DIR__ . '/../../' . $name[0])) {
+            } elseif (\is_dir(__DIR__ . '/../../' . $name[0])) {
                 $path = __DIR__ . '/../../' . $name[0];
             }
 
diff --git a/tests/Controller/Api/ApiControllerAccountTrait.php b/tests/Controller/Api/ApiControllerAccountTrait.php
index 87d7fdc..b42556c 100755
--- a/tests/Controller/Api/ApiControllerAccountTrait.php
+++ b/tests/Controller/Api/ApiControllerAccountTrait.php
@@ -106,6 +106,10 @@ trait ApiControllerAccountTrait
         self::assertGreaterThan(0, $response->get('')['response']->getId());
     }
 
+    /**
+     * @covers Modules\Admin\Controller\ApiController
+     * @group module
+     */
     public function testApiAccountCreateWithCustomLocale() : void
     {
         $response = new HttpResponse();
diff --git a/tests/Controller/Api/ApiControllerApplicationTrait.php b/tests/Controller/Api/ApiControllerApplicationTrait.php
index aacd910..17f4401 100644
--- a/tests/Controller/Api/ApiControllerApplicationTrait.php
+++ b/tests/Controller/Api/ApiControllerApplicationTrait.php
@@ -21,6 +21,10 @@ use phpOMS\Uri\HttpUri;
 
 trait ApiControllerApplicationTrait
 {
+    /**
+     * @covers Modules\Admin\Controller\Apicontroller
+     * @group module
+     */
     public function testApiInvalidAppplicationPathInstall() : void
     {
         $response = new HttpResponse();
diff --git a/tests/Controller/Api/ApiControllerSettingsTrait.php b/tests/Controller/Api/ApiControllerSettingsTrait.php
index 74efa19..7053376 100755
--- a/tests/Controller/Api/ApiControllerSettingsTrait.php
+++ b/tests/Controller/Api/ApiControllerSettingsTrait.php
@@ -61,6 +61,10 @@ trait ApiControllerSettingsTrait
         $this->module->apiSettingsSet($request, $response);
     }
 
+    /**
+     * @covers Modules\Admin\Controller\ApiController
+     * @group module
+     */
     public function testApiAccountLocalizationLoadSet() : void
     {
         $response = new HttpResponse();
@@ -82,6 +86,10 @@ trait ApiControllerSettingsTrait
         self::assertEquals($l11n->getLanguage(), 'en');
     }
 
+    /**
+     * @covers Modules\Admin\Controller\ApiController
+     * @group module
+     */
     public function testApiAccountLocalizationSet() : void
     {
         $response = new HttpResponse();
@@ -102,6 +110,10 @@ trait ApiControllerSettingsTrait
         self::assertEquals($l11n->getCurrency(), 'EUR');
     }
 
+    /**
+     * @covers Modules\Admin\Controller\ApiController
+     * @group module
+     */
     public function testInvalidPermissionAccountLocalizationSet() : void
     {
         $response = new HttpResponse();
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 8e26792..09bc47c 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -42,6 +42,9 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
 {
     protected ApplicationAbstract $app;
 
+    /**
+     * @var \Modules\Admin\Controller\ApiController
+     */
     protected ModuleAbstract $module;
 
     protected function setUp() : void
diff --git a/tests/Models/AccountMapperTest.php b/tests/Models/AccountMapperTest.php
index d5cfe4e..7b27e6e 100755
--- a/tests/Models/AccountMapperTest.php
+++ b/tests/Models/AccountMapperTest.php
@@ -102,6 +102,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, AccountMapper::login('admin', 'orange'));
     }
 
+    /**
+     * @covers Modules\Admin\Models\AccountMapper
+     * @group module
+     */
     public function testInvalidLoginTries() : void
     {
         $accountR = AccountMapper::get(1);
@@ -114,6 +118,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
         AccountMapper::update($accountR);
     }
 
+    /**
+     * @covers Modules\Admin\Models\AccountMapper
+     * @group module
+     */
     public function testInvalidLoginAccountStatus() : void
     {
         $accountR = AccountMapper::get(1);
@@ -126,6 +134,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
         AccountMapper::update($accountR);
     }
 
+    /**
+     * @covers Modules\Admin\Models\AccountMapper
+     * @group module
+     */
     public function testEmptyLoginPassword() : void
     {
         $accountR = AccountMapper::get(1);
diff --git a/tests/Models/NullAccountPermissionTest.php b/tests/Models/NullAccountPermissionTest.php
index ede80c1..f988550 100755
--- a/tests/Models/NullAccountPermissionTest.php
+++ b/tests/Models/NullAccountPermissionTest.php
@@ -21,11 +21,19 @@ use Modules\Admin\Models\NullAccountPermission;
  */
 final class NullAccountPermissionTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @covers Modules\Admin\Models\NullAccountPermission
+     * @group module
+     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Admin\Models\AccountPermission', new NullAccountPermission());
     }
 
+    /**
+     * @covers Modules\Admin\Models\NullAccountPermission
+     * @group module
+     */
     public function testId() : void
     {
         $null = new NullAccountPermission(2);
diff --git a/tests/Models/NullAccountTest.php b/tests/Models/NullAccountTest.php
index 7d7d757..9544a40 100755
--- a/tests/Models/NullAccountTest.php
+++ b/tests/Models/NullAccountTest.php
@@ -21,11 +21,19 @@ use Modules\Admin\Models\NullAccount;
  */
 final class NullAccountTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @covers Modules\Admin\Models\NullAccount
+     * @group module
+     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Admin\Models\Account', new NullAccount());
     }
 
+    /**
+     * @covers Modules\Admin\Models\NullAccount
+     * @group module
+     */
     public function testId() : void
     {
         $null = new NullAccount(2);
diff --git a/tests/Models/NullAddressTest.php b/tests/Models/NullAddressTest.php
index 1f48ecf..012ff39 100755
--- a/tests/Models/NullAddressTest.php
+++ b/tests/Models/NullAddressTest.php
@@ -21,11 +21,19 @@ use Modules\Admin\Models\NullAddress;
  */
 final class NullAddressTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @covers Modules\Admin\Models\NullAddress
+     * @group module
+     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Admin\Models\Address', new NullAddress());
     }
 
+    /**
+     * @covers Modules\Admin\Models\NullAddress
+     * @group module
+     */
     public function testId() : void
     {
         $null = new NullAddress(2);
diff --git a/tests/Models/NullGroupPermissionTest.php b/tests/Models/NullGroupPermissionTest.php
index 64b3fbf..67b657e 100755
--- a/tests/Models/NullGroupPermissionTest.php
+++ b/tests/Models/NullGroupPermissionTest.php
@@ -21,11 +21,19 @@ use Modules\Admin\Models\NullGroupPermission;
  */
 final class NullGroupPermissionTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @covers Modules\Admin\Models\NullGroupPermission
+     * @group module
+     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Admin\Models\GroupPermission', new NullGroupPermission());
     }
 
+    /**
+     * @covers Modules\Admin\Models\NullGroupPermission
+     * @group module
+     */
     public function testId() : void
     {
         $null = new NullGroupPermission(2);
diff --git a/tests/Models/NullGroupTest.php b/tests/Models/NullGroupTest.php
index bacbd2b..3964a6a 100755
--- a/tests/Models/NullGroupTest.php
+++ b/tests/Models/NullGroupTest.php
@@ -21,11 +21,19 @@ use Modules\Admin\Models\NullGroup;
  */
 final class NullGroupTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @covers Modules\Admin\Models\NullGroup
+     * @group module
+     */
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Admin\Models\Group', new NullGroup());
     }
 
+    /**
+     * @covers Modules\Admin\Models\NullGroup
+     * @group module
+     */
     public function testId() : void
     {
         $null = new NullGroup(2);