diff --git a/tests/Controller/Api/ApiControllerCollectionTrait.php b/tests/Controller/Api/ApiControllerCollectionTrait.php
index fd5487f..efe8e8b 100755
--- a/tests/Controller/Api/ApiControllerCollectionTrait.php
+++ b/tests/Controller/Api/ApiControllerCollectionTrait.php
@@ -28,8 +28,8 @@ trait ApiControllerCollectionTrait
 {
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiCollectionCreateWitRandomPath() : void
     {
         $response = new HttpResponse();
@@ -93,8 +93,8 @@ trait ApiControllerCollectionTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiCollectionCreateInvalid() : void
     {
         $response = new HttpResponse();
@@ -108,8 +108,8 @@ trait ApiControllerCollectionTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiCollectionCreateWithPath() : void
     {
         $response = new HttpResponse();
@@ -130,8 +130,8 @@ trait ApiControllerCollectionTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiCollectionFromMedia() : void
     {
         $media                 = new Media();
diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php
index 7a961e9..d368884 100755
--- a/tests/Controller/Api/ApiControllerMediaTrait.php
+++ b/tests/Controller/Api/ApiControllerMediaTrait.php
@@ -29,8 +29,8 @@ trait ApiControllerMediaTrait
 {
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCreateDbEntries() : void
     {
         $status = [
@@ -77,8 +77,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaUploadRandomPath() : void
     {
         $response = new HttpResponse();
@@ -126,8 +126,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaUploadDefinedPath() : void
     {
         $response = new HttpResponse();
@@ -180,8 +180,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testUploadFilesInvalidPathSetting() : void
     {
         self::assertEquals(
@@ -198,8 +198,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaUpdate() : void
     {
         $response = new HttpResponse();
@@ -263,8 +263,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaCreateWithPath() : void
     {
         $response = new HttpResponse();
@@ -286,8 +286,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCreateView() : void
     {
         $media = new Media();
@@ -312,8 +312,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportHTM() : void
     {
         $response = new HttpResponse();
@@ -329,8 +329,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportPDF() : void
     {
         $response = new HttpResponse();
@@ -346,8 +346,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportC() : void
     {
         $response = new HttpResponse();
@@ -363,8 +363,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportTXT() : void
     {
         $response = new HttpResponse();
@@ -380,8 +380,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportCSV() : void
     {
         $response = new HttpResponse();
@@ -397,8 +397,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportXLS() : void
     {
         $response = new HttpResponse();
@@ -414,8 +414,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportXLSX() : void
     {
         $response = new HttpResponse();
@@ -431,8 +431,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportDOC() : void
     {
         $response = new HttpResponse();
@@ -448,8 +448,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportDOCX() : void
     {
         $response = new HttpResponse();
@@ -465,8 +465,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportPPT() : void
     {
         $response = new HttpResponse();
@@ -482,8 +482,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportPPTX() : void
     {
         $response = new HttpResponse();
@@ -499,8 +499,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportJPG() : void
     {
         $response = new HttpResponse();
@@ -516,8 +516,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportGIF() : void
     {
         $response = new HttpResponse();
@@ -533,8 +533,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportPNG() : void
     {
         $response = new HttpResponse();
@@ -550,8 +550,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportMP3() : void
     {
         $response = new HttpResponse();
@@ -567,8 +567,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportMP4() : void
     {
         $response = new HttpResponse();
@@ -584,8 +584,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportMPEG() : void
     {
         $response = new HttpResponse();
@@ -601,8 +601,8 @@ trait ApiControllerMediaTrait
 
     /**
      * @covers \Modules\Media\Controller\ApiController
-     * @group module
      */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiMediaExportBIN() : void
     {
         $response = new HttpResponse();
diff --git a/tests/Models/CollectionMapperTest.php b/tests/Models/CollectionMapperTest.php
index 468abdb..e7fa076 100755
--- a/tests/Models/CollectionMapperTest.php
+++ b/tests/Models/CollectionMapperTest.php
@@ -21,12 +21,10 @@ use Modules\Media\Models\CollectionMapper;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\CollectionMapper::class)]
 final class CollectionMapperTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\CollectionMapper
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCR() : void
     {
         $media                 = new Collection();
diff --git a/tests/Models/CollectionTest.php b/tests/Models/CollectionTest.php
index 22e38c7..f5e9a56 100755
--- a/tests/Models/CollectionTest.php
+++ b/tests/Models/CollectionTest.php
@@ -21,6 +21,7 @@ use Modules\Media\Models\NullMedia;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\Collection::class)]
 final class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     protected Collection $media;
@@ -33,10 +34,7 @@ final class CollectionTest extends \PHPUnit\Framework\TestCase
         $this->media = new Collection();
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDefault() : void
     {
         self::assertEquals(0, $this->media->id);
@@ -52,30 +50,21 @@ final class CollectionTest extends \PHPUnit\Framework\TestCase
         self::assertInstanceOf('\Modules\Media\Models\NullMedia', $this->media->getSourceByName('invalid'));
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCreatedByInputOutput() : void
     {
         $this->media->createdBy = new NullAccount(1);
         self::assertEquals(1, $this->media->createdBy->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testExtensionInputOutput() : void
     {
         $this->media->extension = 'pdf';
         self::assertEquals('pdf', $this->media->extension);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testPathInputOutput() : void
     {
         $this->media->setPath('/home/root');
@@ -85,40 +74,28 @@ final class CollectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('/home/root', $this->media->getPath());
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDescriptionInputOutput() : void
     {
         $this->media->description = 'This is a description';
         self::assertEquals('This is a description', $this->media->description);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSizeInputOutput() : void
     {
         $this->media->size = 11;
         self::assertEquals(11, $this->media->size);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testVersionedInputOutput() : void
     {
         $this->media->isVersioned = true;
         self::assertTrue($this->media->isVersioned);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSourceInputOutput() : void
     {
         $this->media->setSources([$a = new NullMedia(1), $b = new NullMedia(2), $c = new NullMedia(3)]);
@@ -128,10 +105,7 @@ final class CollectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($b, $this->media->getSourceByName('test'));
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSourceAddInputOutput() : void
     {
         $this->media->setSources([$a = new NullMedia(1), $b = new NullMedia(2), $c = new NullMedia(3)]);
@@ -139,10 +113,7 @@ final class CollectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals([$a, $b, $c, $d], $this->media->getSources());
     }
 
-    /**
-     * @covers \Modules\Media\Models\Collection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testIteration() : void
     {
         $this->media->setSources([$a = new NullMedia(1), $b = new NullMedia(2), $c = new NullMedia(3)]);
diff --git a/tests/Models/MediaMapperTest.php b/tests/Models/MediaMapperTest.php
index 3b4d749..1e43e45 100755
--- a/tests/Models/MediaMapperTest.php
+++ b/tests/Models/MediaMapperTest.php
@@ -23,12 +23,10 @@ use Modules\Media\Models\MediaMapper;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\MediaMapper::class)]
 final class MediaMapperTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\MediaMapper
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCR() : void
     {
         $media                 = new Media();
@@ -56,10 +54,7 @@ final class MediaMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($media->name, $mediaR->name);
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaMapper
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testAbsolute() : void
     {
         $media              = new Media();
@@ -86,10 +81,7 @@ final class MediaMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($media->name, $mediaR->name);
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaMapper
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDirectoryMapping() : void
     {
         $media              = new Media();
@@ -116,10 +108,7 @@ final class MediaMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($media->name, $mediaR->name);
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaMapper
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testGetVirtualPath() : void
     {
         $media              = new Media();
@@ -148,10 +137,7 @@ final class MediaMapperTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($media->name, $mediaR->name);
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaMapper
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testParentcollection() : void
     {
         $collection                 = new Collection();
diff --git a/tests/Models/MediaTest.php b/tests/Models/MediaTest.php
index 5013599..3fd6f70 100755
--- a/tests/Models/MediaTest.php
+++ b/tests/Models/MediaTest.php
@@ -21,6 +21,7 @@ use Modules\Media\Models\MediaStatus;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\Media::class)]
 final class MediaTest extends \PHPUnit\Framework\TestCase
 {
     protected Media $media;
@@ -33,10 +34,7 @@ final class MediaTest extends \PHPUnit\Framework\TestCase
         $this->media = new Media();
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDefault() : void
     {
         self::assertEquals(0, $this->media->id);
@@ -53,30 +51,21 @@ final class MediaTest extends \PHPUnit\Framework\TestCase
         self::assertFalse($this->media->isVersioned);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCreatedByInputOutput() : void
     {
         $this->media->createdBy = new NullAccount(1);
         self::assertEquals(1, $this->media->createdBy->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testExtensionInputOutput() : void
     {
         $this->media->extension = 'pdf';
         self::assertEquals('pdf', $this->media->extension);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testPathInputOutput() : void
     {
         $this->media->setPath('/home/root');
@@ -86,90 +75,63 @@ final class MediaTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('/home/root', $this->media->getPath());
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testAbsolutePathInputOutput() : void
     {
         $this->media->isAbsolute = true;
         self::assertTrue($this->media->isAbsolute);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNameInputOutput() : void
     {
         $this->media->name = 'Report';
         self::assertEquals('Report', $this->media->name);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDescriptionInputOutput() : void
     {
         $this->media->description = 'This is a description';
         self::assertEquals('This is a description', $this->media->description);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDescriptionRawInputOutput() : void
     {
         $this->media->descriptionRaw = 'This is a description raw';
         self::assertEquals('This is a description raw', $this->media->descriptionRaw);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSizeInputOutput() : void
     {
         $this->media->size = 11;
         self::assertEquals(11, $this->media->size);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testVersionedInputOutput() : void
     {
         $this->media->isVersioned = true;
         self::assertTrue($this->media->isVersioned);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testVirtualPathInputOutput() : void
     {
         $this->media->setVirtualPath('/test/path');
         self::assertEquals('/test/path', $this->media->getVirtualPath());
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testHiddenInputOutput() : void
     {
         $this->media->status = MediaStatus::HIDDEN;
         self::assertEquals(MediaStatus::HIDDEN, $this->media->status);
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testPasswordInputOutput() : void
     {
         $this->media->setPassword('test');
@@ -177,10 +139,7 @@ final class MediaTest extends \PHPUnit\Framework\TestCase
         self::assertFalse($this->media->comparePassword('test2'));
     }
 
-    /**
-     * @covers \Modules\Media\Models\Media
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSerialize() : void
     {
         $this->media->createdBy = $acc = new NullAccount(1);
diff --git a/tests/Models/MediaTypeTest.php b/tests/Models/MediaTypeTest.php
index 252ea57..fcbf868 100755
--- a/tests/Models/MediaTypeTest.php
+++ b/tests/Models/MediaTypeTest.php
@@ -20,6 +20,7 @@ use phpOMS\Localization\BaseStringL11n;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\MediaType::class)]
 final class MediaTypeTest extends \PHPUnit\Framework\TestCase
 {
     private MediaType $type;
@@ -32,20 +33,14 @@ final class MediaTypeTest extends \PHPUnit\Framework\TestCase
         $this->type = new MediaType();
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDefault() : void
     {
         self::assertEquals(0, $this->type->id);
         self::assertEquals('', $this->type->name);
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testL11nInputOutput() : void
     {
         $this->type->setL11n('Test1');
@@ -55,10 +50,7 @@ final class MediaTypeTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('Test2', $this->type->getL11n());
     }
 
-    /**
-     * @covers \Modules\Media\Models\MediaType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSerialize() : void
     {
         $this->type->name = 'Name';
diff --git a/tests/Models/NullCollectionTest.php b/tests/Models/NullCollectionTest.php
index bee7b80..6357be1 100755
--- a/tests/Models/NullCollectionTest.php
+++ b/tests/Models/NullCollectionTest.php
@@ -19,31 +19,23 @@ use Modules\Media\Models\NullCollection;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\NullCollection::class)]
 final class NullCollectionTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\NullCollection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Media\Models\Collection', new NullCollection());
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullCollection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullCollection(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullCollection
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullCollection(2);
diff --git a/tests/Models/NullMediaContentTest.php b/tests/Models/NullMediaContentTest.php
index bbd279b..0bbe996 100644
--- a/tests/Models/NullMediaContentTest.php
+++ b/tests/Models/NullMediaContentTest.php
@@ -19,31 +19,23 @@ use Modules\Media\Models\NullMediaContent;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\NullMediaContent::class)]
 final class NullMediaContentTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\NullMediaContent
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Media\Models\MediaContent', new NullMediaContent());
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullMediaContent
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullMediaContent(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullMediaContent
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullMediaContent(2);
diff --git a/tests/Models/NullMediaTest.php b/tests/Models/NullMediaTest.php
index 1ce9c91..76c5ec5 100755
--- a/tests/Models/NullMediaTest.php
+++ b/tests/Models/NullMediaTest.php
@@ -19,31 +19,23 @@ use Modules\Media\Models\NullMedia;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\NullMedia::class)]
 final class NullMediaTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\NullMedia
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Media\Models\Media', new NullMedia());
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullMedia
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullMedia(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullMedia
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullMedia(2);
diff --git a/tests/Models/NullMediaTypeTest.php b/tests/Models/NullMediaTypeTest.php
index 9320de5..0252989 100755
--- a/tests/Models/NullMediaTypeTest.php
+++ b/tests/Models/NullMediaTypeTest.php
@@ -19,31 +19,23 @@ use Modules\Media\Models\NullMediaType;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\NullMediaType::class)]
 final class NullMediaTypeTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\NullMediaType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Media\Models\MediaType', new NullMediaType());
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullMediaType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullMediaType(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullMediaType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullMediaType(2);
diff --git a/tests/Models/NullReferenceTest.php b/tests/Models/NullReferenceTest.php
index f49c72e..25c80f7 100644
--- a/tests/Models/NullReferenceTest.php
+++ b/tests/Models/NullReferenceTest.php
@@ -19,31 +19,23 @@ use Modules\Media\Models\NullReference;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Models\NullReference::class)]
 final class NullReferenceTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Media\Models\NullReference
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Media\Models\Reference', new NullReference());
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullReference
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullReference(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Media\Models\NullReference
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullReference(2);
diff --git a/tests/Views/MediaViewTest.php b/tests/Views/MediaViewTest.php
index fbfeebe..f3dfcee 100755
--- a/tests/Views/MediaViewTest.php
+++ b/tests/Views/MediaViewTest.php
@@ -20,6 +20,7 @@ use Modules\Media\Views\MediaView;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Media\Views\MediaView::class)]
 final class MediaViewTest extends \PHPUnit\Framework\TestCase
 {
     protected MediaView $view;
@@ -32,10 +33,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         $this->view = new MediaView();
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testFilePath() : void
     {
         $method = new \ReflectionMethod($this->view, 'filePathFunction');
@@ -56,10 +54,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDirPath() : void
     {
         $method = new \ReflectionMethod($this->view, 'dirPathFunction');
@@ -80,10 +75,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testIscollection() : void
     {
         $method = new \ReflectionMethod($this->view, 'isCollectionFunction');
@@ -117,10 +109,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testFileContent() : void
     {
         $method = new \ReflectionMethod($this->view, 'getFileContent');
@@ -132,10 +121,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testInvalidFileContentPath() : void
     {
         $method = new \ReflectionMethod($this->view, 'getFileContent');
@@ -147,10 +133,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testFileLineContent() : void
     {
         $method = new \ReflectionMethod($this->view, 'lineContentFunction');
@@ -165,10 +148,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testInvalidFileLineContentPath() : void
     {
         $method = new \ReflectionMethod($this->view, 'lineContentFunction');
@@ -180,10 +160,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testIsImage() : void
     {
         $method = new \ReflectionMethod($this->view, 'isImageFile');
@@ -204,10 +181,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testIsText() : void
     {
         $method = new \ReflectionMethod($this->view, 'isTextFile');
@@ -235,10 +209,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testIsVideo() : void
     {
         $method = new \ReflectionMethod($this->view, 'isVideoFile');
@@ -252,10 +223,7 @@ final class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @covers \Modules\Media\Views\MediaView
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testIsAudio() : void
     {
         $method = new \ReflectionMethod($this->view, 'isAudioFile');
diff --git a/tests/phpunit_default.xml b/tests/phpunit_default.xml
index d350430..e4a5639 100755
--- a/tests/phpunit_default.xml
+++ b/tests/phpunit_default.xml
@@ -1,31 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="Bootstrap.php" colors="true" columns="120" stopOnError="true" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true" processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">../</directory>
-    </include>
-    <exclude>
-      <directory>../vendor*</directory>
-      <directory>../MainRepository*</directory>
-      <directory>../Karaka*</directory>
-      <directory>../Admin/Install/Application*</directory>
-      <directory>../phpOMS*</directory>
-      <directory>../tests*</directory>
-      <directory>../*/tests*</directory>
-      <directory>../**/tests*</directory>
-      <directory>*/tests*</directory>
-      <directory suffix="tpl.php">../*</directory>
-      <directory suffix="lang.php">../*</directory>
-      <directory suffix="Test.php">../*</directory>
-      <directory suffix="Routes.php">../*</directory>
-      <directory suffix="Hooks.php">../*</directory>
-      <directory>../**/test*</directory>
-      <directory>../**/Theme*</directory>
-      <directory>../**/Admin/Routes*</directory>
-      <directory>../**/Admin/Hooks*</directory>
-      <directory>../**/Admin/Install*</directory>
-      <directory>../Media/Files*</directory>
-    </exclude>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="Bootstrap.php" colors="true" columns="120" stopOnError="true" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage includeUncoveredFiles="true">
     <report>
       <clover outputFile="coverage.xml"/>
       <html outputDirectory="../tests" lowUpperBound="75" highLowerBound="95"/>
@@ -56,4 +31,31 @@
     <const name="WEB_SERVER_DOCROOT" value="./Karaka"/>
     <const name="RESET" value="1"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">../</directory>
+    </include>
+    <exclude>
+      <directory>../vendor*</directory>
+      <directory>../MainRepository*</directory>
+      <directory>../Karaka*</directory>
+      <directory>../Admin/Install/Application*</directory>
+      <directory>../phpOMS*</directory>
+      <directory>../tests*</directory>
+      <directory>../*/tests*</directory>
+      <directory>../**/tests*</directory>
+      <directory>*/tests*</directory>
+      <directory suffix="tpl.php">../*</directory>
+      <directory suffix="lang.php">../*</directory>
+      <directory suffix="Test.php">../*</directory>
+      <directory suffix="Routes.php">../*</directory>
+      <directory suffix="Hooks.php">../*</directory>
+      <directory>../**/test*</directory>
+      <directory>../**/Theme*</directory>
+      <directory>../**/Admin/Routes*</directory>
+      <directory>../**/Admin/Hooks*</directory>
+      <directory>../**/Admin/Install*</directory>
+      <directory>../Media/Files*</directory>
+    </exclude>
+  </source>
 </phpunit>