diff --git a/tests/lib/SimpleSAML/Auth/SimpleTest.php b/tests/lib/SimpleSAML/Auth/SimpleTest.php
index 7acd280412b2c6c66ff14e39ebebe8f5549ae562..d2b5e56fbde9a9682beb459b3f619bae5ed0fc7f 100644
--- a/tests/lib/SimpleSAML/Auth/SimpleTest.php
+++ b/tests/lib/SimpleSAML/Auth/SimpleTest.php
@@ -12,6 +12,7 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 /**
  * Tests for \SimpleSAML\Auth\Simple
  *
+ * @covers \SimpleSAML\Auth\Simple
  */
 class SimpleTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/Auth/SourceTest.php b/tests/lib/SimpleSAML/Auth/SourceTest.php
index c8d2cdcb0f0e127c9aaa908777ef020f8a1348a2..415d69ae274a3dbf62290c91bca92e74bb1807e1 100644
--- a/tests/lib/SimpleSAML/Auth/SourceTest.php
+++ b/tests/lib/SimpleSAML/Auth/SourceTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Test\Utils\TestAuthSourceFactory;
 
 /**
  * Tests for \SimpleSAML\Auth\Source
+ *
+ * @covers \SimpleSAML\Auth\Source
  */
 class SourceTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/Auth/StateTest.php b/tests/lib/SimpleSAML/Auth/StateTest.php
index 43b153dc077c2f411f16b2758b69e1e1a8515153..b8945646402b414a5d5def66c2a7d901f1a08f44 100644
--- a/tests/lib/SimpleSAML/Auth/StateTest.php
+++ b/tests/lib/SimpleSAML/Auth/StateTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Auth;
 
 /**
  * Tests for \SimpleSAML\Auth\State
+ *
+ * @covers \SimpleSAML\Auth\State
  */
 class StateTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/ConfigurationTest.php b/tests/lib/SimpleSAML/ConfigurationTest.php
index 4992c3404e89162c6f11ddf40d9fa88fedc535a4..ae07d2a3318cc55df9537ebe93fe75ca86218c27 100644
--- a/tests/lib/SimpleSAML/ConfigurationTest.php
+++ b/tests/lib/SimpleSAML/ConfigurationTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 
 /**
  * Tests for \SimpleSAML\Configuration
+ *
+ * @covers \SimpleSAML\Configuration
  */
 class ConfigurationTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index f9dcf26dbfb24eac50926211921d5b3cba83eb22..c1251608e85f597d28b26979250887c5dd919ef4 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -21,10 +21,11 @@ use SimpleSAML\Database;
  * should be created for test cases to ensure that it will work
  * in an environment.
  *
+ * @covers \SimpleSAML\Database
+ *
  * @author Tyler Antonio, University of Alberta. <tantonio@ualberta.ca>
  * @package SimpleSAMLphp
  */
-
 class DatabaseTest extends TestCase
 {
     /**
@@ -54,10 +55,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
      * @return void
      */
     public function setUp(): void
@@ -81,10 +78,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
      * @test
      * @return void
      */
@@ -106,10 +99,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
      * @test
      * @return void
      */
@@ -175,11 +164,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
-     * @covers SimpleSAML\Database::getSecondary
      * @test
      * @return void
      */
@@ -232,7 +216,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::applyPrefix
      * @test
      * @return void
      */
@@ -247,10 +230,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::write
-     * @covers SimpleSAML\Database::read
-     * @covers SimpleSAML\Database::exec
-     * @covers SimpleSAML\Database::query
      * @test
      * @return void
      */
@@ -281,8 +260,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::read
-     * @covers SimpleSAML\Database::query
      * @test
      * @return void
      */
@@ -297,8 +274,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::write
-     * @covers SimpleSAML\Database::exec
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Locale/LanguageTest.php b/tests/lib/SimpleSAML/Locale/LanguageTest.php
index 677f95c6fafea4f7abf64113e723c337bd8458c5..e6c3da4de70182af70889caae1f7096ea8fe04a2 100644
--- a/tests/lib/SimpleSAML/Locale/LanguageTest.php
+++ b/tests/lib/SimpleSAML/Locale/LanguageTest.php
@@ -8,6 +8,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Locale\Language;
 
+/**
+ * @covers \SimpleSAML\Locale\Language
+ */
 class LanguageTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Locale/LocalizationTest.php b/tests/lib/SimpleSAML/Locale/LocalizationTest.php
index 3ae4de9d79da7605c8a8761960800a872f39fada..169bafa0d6e8f0477dd5b033d6f0d5b257c40ae7 100644
--- a/tests/lib/SimpleSAML/Locale/LocalizationTest.php
+++ b/tests/lib/SimpleSAML/Locale/LocalizationTest.php
@@ -8,6 +8,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Locale\Localization;
 
+/**
+ * @covers \SimpleSAML\Locale\Localization
+ */
 class LocalizationTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Locale/TranslateTest.php b/tests/lib/SimpleSAML/Locale/TranslateTest.php
index f08de6f337f06b188ab4cca91608571f35dd7fda..d66d16ea58425eb401b10897a9d13a8d1aeef4b7 100644
--- a/tests/lib/SimpleSAML/Locale/TranslateTest.php
+++ b/tests/lib/SimpleSAML/Locale/TranslateTest.php
@@ -8,6 +8,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Locale\Translate;
 
+/**
+ * @covers \SimpleSAML\Locale\Translate
+ */
 class TranslateTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php b/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
index 9abc2a59b0e2eb5901ef1da0d073c94fd18d0c3e..2245cd5b8cfbaa7001cce0718bdb3098f33c8669 100644
--- a/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
+++ b/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
@@ -8,6 +8,9 @@ use SimpleSAML\Configuration;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Test\Utils\ClearStateTestCase;
 
+/**
+ * @covers \SimpleSAML\Metadata\MetadataStorageHandler
+ */
 class MetaDataStorageHandlerTest extends ClearStateTestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php b/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
index 35f33f0d10292d4ff84ec0402315c20795b8582b..9cee1f59df7b88a71357609d3a9e64bc22991262 100644
--- a/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
+++ b/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
@@ -11,8 +11,9 @@ use SimpleSAML\Metadata\MetaDataStorageSource;
 
 /**
  * Class MetaDataStorageSourceTest
+ *
+ * @covers \SimpleSAML\Metadata\MetadataStorageSource
  */
-
 class MetaDataStorageSourceTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
index 105bbb13ead003879c7c82d7aad0dcec07a50b68..d00003bb6f73b943dafc472df95b740831b98782 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
@@ -9,8 +9,9 @@ use SimpleSAML\Metadata\SAMLBuilder;
 
 /**
  * Class SAMLBuilderTest
+ *
+ * @covers \SimpleSAML\Metadata\SAMLBuilder
  */
-
 class SAMLBuilderTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
index e4867fdb6f7acb290274682c2709b0ac88552e97..8edf64798e61d386731d576d69e9b662eccb53f9 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
@@ -13,6 +13,8 @@ use SimpleSAML\Metadata\SAMLParser;
 
 /**
  * Test SAML parsing
+ *
+ * @covers \SimpleSAML\Metadata\SAMLParser
  */
 class SAMLParserTest extends \SimpleSAML\Test\SigningTestCase
 {
diff --git a/tests/lib/SimpleSAML/ModuleTest.php b/tests/lib/SimpleSAML/ModuleTest.php
index 78f34f457a0fdf57368f222cca1a35c8046a2103..ce567e5093e1088ae0244904c8de7516138983b3 100644
--- a/tests/lib/SimpleSAML/ModuleTest.php
+++ b/tests/lib/SimpleSAML/ModuleTest.php
@@ -9,6 +9,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module;
 
+/**
+ * @covers \SimpleSAML\Module
+ */
 class ModuleTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
index 5558e12e66e0525f44311d7c14432794ca9a36d9..058e7d24b09949a2a5cc6c3993b1dda367070fa7 100644
--- a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
+++ b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
@@ -9,6 +9,9 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\SessionHandlerPHP;
 use SimpleSAML\Configuration;
 
+/**
+ * @covers \SimpleSAML\SessionHandlerPHP
+ */
 class SessionHandlerPHPTest extends ClearStateTestCase
 {
     /** @var array */
@@ -49,9 +52,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::__construct()
-     * @covers SimpleSAML\SessionHandlerPHP::getSessionHandler()
-     * @covers SimpleSAML\SessionHandler::getSessionHandler()
      * @return void
      */
     public function testGetSessionHandler(): void
@@ -63,7 +63,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -88,7 +87,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -110,7 +108,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -132,7 +129,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -154,7 +150,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::restorePrevious()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -180,7 +175,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::newSessionId()
      * @return void
      */
     public function testNewSessionId(): void
diff --git a/tests/lib/SimpleSAML/SessionTest.php b/tests/lib/SimpleSAML/SessionTest.php
index a2abe78aeeb9dc7f8bf9306f00aef82e027f348e..07e8ab7786c7b8a8fb6b28d66ff233846e718c58 100644
--- a/tests/lib/SimpleSAML/SessionTest.php
+++ b/tests/lib/SimpleSAML/SessionTest.php
@@ -9,6 +9,9 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\Session;
 use SimpleSAML\Configuration;
 
+/**
+ * @covers \SimpleSAML\Session
+ */
 class SessionTest extends ClearStateTestCase
 {
     /** @var \SimpleSAML\Session */
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
index 6041142c25a736f139d61e6c2581b33cc98aad15..27b466426461f74a100b7d3d4c7e3fb1e5daa528 100644
--- a/tests/lib/SimpleSAML/Store/RedisTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -16,6 +16,7 @@ use SimpleSAML\Store;
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source
  * code.
  *
+ * @covers \SimpleSAML\Store\Redis
  * @package simplesamlphp/simplesamlphp
  */
 class RedisTest extends TestCase
@@ -111,8 +112,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
-     * @covers \SimpleSAML\Store\Redis::__construct
      * @test
      * @return void
      */
@@ -134,8 +133,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
-     * @covers \SimpleSAML\Store\Redis::__construct
      * @test
      * @return void
      */
@@ -158,8 +155,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
      * @test
      * @return void
      */
@@ -176,8 +171,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
      * @test
      * @return void
      */
@@ -194,7 +187,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
      * @test
      * @return void
      */
@@ -207,8 +199,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
      * @test
      * @return void
      */
@@ -227,9 +217,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
-     * @covers \SimpleSAML\Store\Redis::delete
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index 8dd5f19e504c6a64c308c961b9f9fd567fe8e749..93fcb53687f2089440e136f6262a8eee685b7bc7 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -15,6 +15,8 @@ use SimpleSAML\Store;
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source
  * code.
  *
+ * @covers \SimpleSAML\Store\SQL
+ *
  * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
@@ -34,8 +36,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
-     * @covers \SimpleSAML\Store\SQL::__construct
      * @test
      * @return void
      */
@@ -48,8 +48,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::initTableVersionTable
-     * @covers \SimpleSAML\Store\SQL::initKVTable
      * @test
      * @return void
      */
@@ -65,7 +63,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::getTableVersion
      * @test
      * @return void
      */
@@ -81,8 +78,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::setTableVersion
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @test
      * @return void
      */
@@ -99,7 +94,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
      * @test
      * @return void
      */
@@ -115,9 +109,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @test
      * @return void
      */
@@ -134,9 +125,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @test
      * @return void
      */
@@ -154,10 +142,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @covers \SimpleSAML\Store\SQL::delete
      * @test
      * @return void
      */
@@ -175,10 +159,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @covers \SimpleSAML\Store\SQL::delete
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 7417b53b89ccd0fa8ed2bf7b934fafca2b702645..e04bc23d7d42253545fa621c91903765eedb6d33 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -16,13 +16,14 @@ use SimpleSAML\Store;
  * For the full copyright and license information, please view the LICENSE file that was
  * distributed with this source code.
  *
+ * @covers \SimpleSAML\Store
+ *
  * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class StoreTest extends TestCase
 {
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -38,7 +39,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -54,7 +54,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -71,7 +70,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -90,7 +88,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -109,7 +106,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Utils/ArraysTest.php b/tests/lib/SimpleSAML/Utils/ArraysTest.php
index b565377001f812787f3b3cfaa9a842c5e0df0ecc..4dbaebeecc34167abb0179b55b0db6c2ef15e6be 100644
--- a/tests/lib/SimpleSAML/Utils/ArraysTest.php
+++ b/tests/lib/SimpleSAML/Utils/ArraysTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Utils\Arrays;
 
 /**
  * Tests for SimpleSAML\Utils\Arrays.
+ *
+ * @covers \SimpleSAML\Utils\Arrays
  */
 class ArraysTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/AttributesTest.php b/tests/lib/SimpleSAML/Utils/AttributesTest.php
index 74f3f8bb0649bb111a505861eeb50a57bbe57cae..63b4f5b7e57a57100ba8283351431859c4080546 100644
--- a/tests/lib/SimpleSAML/Utils/AttributesTest.php
+++ b/tests/lib/SimpleSAML/Utils/AttributesTest.php
@@ -12,6 +12,7 @@ use SimpleSAML\Utils\Attributes;
 /**
  * Tests for SimpleSAML\Utils\Attributes.
  *
+ * @covers \SimpleSAML\Utils\Attributes
  * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
  */
 class AttributesTest extends TestCase
diff --git a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
index f8480392c7f2f3d37bd9fa6b2d22f528ff2217ae..db198ef8f6f8956bb4f3a848d4a91c63d40b1cd2 100644
--- a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
+++ b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
@@ -13,6 +13,8 @@ use TypeError;
 
 /**
  * Tests related to SAML metadata.
+ *
+ * @covers \SimpleSAML\Utils\Config
  */
 class MetadataTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/ConfigTest.php b/tests/lib/SimpleSAML/Utils/ConfigTest.php
index bc7585a27c72c709f63ba87c08b254dcd4a33da2..6f683b4a9ce1ffda88e481ae8d7eb3cfc90b091b 100644
--- a/tests/lib/SimpleSAML/Utils/ConfigTest.php
+++ b/tests/lib/SimpleSAML/Utils/ConfigTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Utils\Config;
 
 /**
  * Tests for SimpleSAML\Utils\Config
+ *
+ * @covers \SimpleSAML\Utils\Config
  */
 class ConfigTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/CryptoTest.php b/tests/lib/SimpleSAML/Utils/CryptoTest.php
index d2cc235c51efd8fecb2a8bddcaab88722e1e033f..04346750e40d61a93700ebd94e086eeee947feac 100644
--- a/tests/lib/SimpleSAML/Utils/CryptoTest.php
+++ b/tests/lib/SimpleSAML/Utils/CryptoTest.php
@@ -13,6 +13,8 @@ use SimpleSAML\Utils\Crypto;
 
 /**
  * Tests for SimpleSAML\Utils\Crypto.
+ *
+ * @covers \SimpleSAML\Utils\Crypto
  */
 class CryptoTest extends TestCase
 {
@@ -51,7 +53,6 @@ class CryptoTest extends TestCase
      * Test that aesDecrypt() works properly, being able to decrypt some previously known (and correct)
      * ciphertext.
      *
-     * @covers \SimpleSAML\Utils\Crypto::aesDecrypt
      * @return void
      */
     public function testAesDecrypt(): void
@@ -74,8 +75,6 @@ class CryptoTest extends TestCase
     /**
      * Test that aesEncrypt() produces ciphertexts that aesDecrypt() can decrypt.
      *
-     * @covers \SimpleSAML\Utils\Crypto::aesDecrypt
-     * @covers \SimpleSAML\Utils\Crypto::aesEncrypt
      * @return void
      */
     public function testAesEncrypt(): void
@@ -100,8 +99,6 @@ class CryptoTest extends TestCase
     /**
      * Test that the pem2der() and der2pem() methods work correctly.
      *
-     * @covers \SimpleSAML\Utils\Crypto::der2pem
-     * @covers \SimpleSAML\Utils\Crypto::pem2der
      * @return void
      */
     public function testFormatConversion(): void
@@ -147,7 +144,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::pwValid
      * @return void
      */
     public function testGoodPwValid(): void
@@ -162,7 +158,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::pwValid
      * @return void
      */
     public function testBadPwInvalid(): void
@@ -178,7 +173,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::secureCompare
      * @return void
      */
     public function testSecureCompareEqual(): void
@@ -190,7 +184,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::secureCompare
      * @return void
      */
     public function testSecureCompareNotEqual(): void
@@ -202,7 +195,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyRequiredMetadataMissing(): void
@@ -216,7 +208,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyNotRequiredMetadataMissing(): void
@@ -231,7 +222,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyMissingFile(): void
@@ -244,7 +234,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyBasic(): void
@@ -264,7 +253,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyPassword(): void
@@ -291,7 +279,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyPrefix(): void
@@ -319,7 +306,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyRequiredMetadataMissing(): void
@@ -333,7 +319,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyNotRequiredMetadataMissing(): void
@@ -348,7 +333,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyNotX509Certificate(): void
@@ -373,7 +357,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyNotSigning(): void
@@ -398,7 +381,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyBasic(): void
diff --git a/tests/lib/SimpleSAML/Utils/EMailTest.php b/tests/lib/SimpleSAML/Utils/EMailTest.php
index e775c05d8c7acf1a228326be9a5033b5fa0b8705..fcaa4d8aba9eb09114cc50166c964b7c9937379c 100644
--- a/tests/lib/SimpleSAML/Utils/EMailTest.php
+++ b/tests/lib/SimpleSAML/Utils/EMailTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Utils\EMail;
 
 /**
  * A base SSP test case that tests some simple e-mail related calls
+ *
+ * @covers \SimpleSAML\Utils\EMail
  */
 class EMailTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/HTTPTest.php b/tests/lib/SimpleSAML/Utils/HTTPTest.php
index 0b497123ec61702db233d763804c65fe3fdf35e8..17e8004a74272b19a85e6c1b689a4ddceaaf09ed 100644
--- a/tests/lib/SimpleSAML/Utils/HTTPTest.php
+++ b/tests/lib/SimpleSAML/Utils/HTTPTest.php
@@ -10,6 +10,9 @@ use SimpleSAML\Error;
 use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\Utils\HTTP;
 
+/**
+ * @covers \SimpleSAML\Utils\HTTP
+ */
 class HTTPTest extends ClearStateTestCase
 {
     /**
@@ -427,7 +430,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::getFirstPathElement()
      * @return void
      */
     public function testGetFirstPathElement(): void
@@ -441,7 +443,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -502,7 +503,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::setCookie()
      * @return void
      */
     public function testSetCookieInsecure(): void
@@ -523,7 +523,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
diff --git a/tests/lib/SimpleSAML/Utils/NetTest.php b/tests/lib/SimpleSAML/Utils/NetTest.php
index fcacbc18f524df21209da10e3bea8f6442cb4208..ded9ff93ef13776f9fa2e22839f601e04528a847 100644
--- a/tests/lib/SimpleSAML/Utils/NetTest.php
+++ b/tests/lib/SimpleSAML/Utils/NetTest.php
@@ -9,13 +9,14 @@ use SimpleSAML\Utils\Net;
 
 /**
  * Tests for SimpleSAML\Utils\Test.
+ *
+ * @covers \SimpleSAML\Utils\Net
  */
 class NetTest extends TestCase
 {
     /**
      * Test the function that checks for IPs belonging to a CIDR.
      *
-     * @covers SimpleSAML\Utils\Net::ipCIDRcheck
      * @return void
      */
     public function testIpCIDRcheck(): void
@@ -51,7 +52,6 @@ class NetTest extends TestCase
     /**
      * Test IPv6 support in SimpleSAML\Utils\Net::ipCIDRcheck.
      *
-     * @covers SimpleSAML\Utils\Net::ipCIDRcheck
      * @return void
      */
     public function testIpv6CIDRcheck(): void
diff --git a/tests/lib/SimpleSAML/Utils/RandomTest.php b/tests/lib/SimpleSAML/Utils/RandomTest.php
index d059e5cf8315bb5922988787594f311350c86f52..8e204a2db291324c3ce35a9aab7ae342b0f0b213 100644
--- a/tests/lib/SimpleSAML/Utils/RandomTest.php
+++ b/tests/lib/SimpleSAML/Utils/RandomTest.php
@@ -9,13 +9,14 @@ use SimpleSAML\Utils\Random;
 
 /**
  * Tests for SimpleSAML\Utils\Random.
+ *
+ * @covers \SimpleSAML\Utils\Random
  */
 class RandomTest extends TestCase
 {
     /**
      * Test for SimpleSAML\Utils\Random::generateID().
      *
-     * @covers SimpleSAML\Utils\Random::generateID
      * @return void
      */
     public function testGenerateID(): void
diff --git a/tests/lib/SimpleSAML/Utils/SystemTest.php b/tests/lib/SimpleSAML/Utils/SystemTest.php
index ab10c1c71868901ee93e85ac84a71b1ed33a7634..3bd3619843bda8ed9613eabf77118a5db5ed869b 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -14,6 +14,8 @@ use SimpleSAML\Utils\System;
 
 /**
  * Tests for SimpleSAML\Utils\System.
+ *
+ * @covers \SimpleSAML\Utils\Random
  */
 class SystemTest extends TestCase
 {
@@ -45,7 +47,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getOS
      * @test
      * @return void
      */
@@ -58,7 +59,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -75,7 +75,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -92,7 +91,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -109,7 +107,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -126,7 +123,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -143,7 +139,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -160,7 +155,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::writeFile
      * @test
      * @return void
      */
@@ -180,7 +174,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::writeFile
      * @test
      * @return void
      */
@@ -204,7 +197,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::writeFile
      * @test
      * @return void
      */
@@ -228,7 +220,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getTempDir
      * @test
      * @return void
      */
@@ -248,7 +239,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getTempDir
      * @test
      * @return void
      */
@@ -268,7 +258,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getTempDir
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Utils/TimeTest.php b/tests/lib/SimpleSAML/Utils/TimeTest.php
index 9a12a3b12753824689b74a71d98a2c4d100f289f..00e1a7c150931caa3279194026c5c4f22204b05a 100644
--- a/tests/lib/SimpleSAML/Utils/TimeTest.php
+++ b/tests/lib/SimpleSAML/Utils/TimeTest.php
@@ -11,12 +11,14 @@ use SimpleSAML\Configuration;
 use SimpleSAML\Error;
 use SimpleSAML\Utils\Time;
 
+/**
+ * @covers \SimpleSAML\Utils\Time
+ */
 class TimeTest extends TestCase
 {
     /**
      * Test the SimpleSAML\Utils\Time::generateTimestamp() method.
      *
-     * @covers SimpleSAML\Utils\Time::generateTimestamp
      * @return void
      */
     public function testGenerateTimestamp(): void
@@ -32,7 +34,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::initTimezone() method.
      *
-     * @covers SimpleSAML\Utils\Time::initTimezone
      * @return void
      */
     public function testInitTimezone(): void
@@ -77,7 +78,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::parseDuration() method.
      *
-     * @covers SimpleSAML\Utils\Time::parseDuration
      * @return void
      */
     public function testParseDuration(): void
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index b0a6e5b41078d6dd3f5cbe3714177c46b69559a8..c41ae9a1a955db4d16624ad53e8120eaf1d70b76 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -17,13 +17,14 @@ use SimpleSAML\Utils\XML;
 
 /**
  * Tests for SimpleSAML\Utils\XML.
+ *
+ * @covers \SimpleSAML\Utils\XML
  */
 class XMLTest extends TestCase
 {
     private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -40,7 +41,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -56,7 +56,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -73,7 +72,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -91,7 +89,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -109,7 +106,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -127,7 +123,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMText
      * @test
      * @return void
      */
@@ -146,7 +141,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMText
      * @test
      * @return void
      */
@@ -167,7 +161,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMText
      * @test
      * @return void
      */
@@ -183,7 +176,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMChildren
      * @test
      * @return void
      */
@@ -203,7 +195,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMChildren
      * @test
      * @return void
      */
@@ -222,7 +213,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMChildren
      * @test
      * @return void
      */
@@ -242,7 +232,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -266,7 +255,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -294,7 +282,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -323,7 +310,6 @@ HEREDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -348,7 +334,6 @@ HEREDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatXMLString
      * @test
      * @return void
      */
@@ -368,7 +353,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatXMLString
      * @test
      * @return void
      */
@@ -382,7 +366,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isValid
      * @test
      * @return void
      */
@@ -399,7 +382,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isValid
      * @return void
      */
     public function testIsValidMetadata(): void
@@ -415,7 +397,6 @@ NOWDOC;
     }
 
     /**
-     * @covers \SimpleSAML\Utils\XML::checkSAMLMessage()
      * @return void
      */
     public function testCheckSAMLMessageInvalidType(): void
diff --git a/tests/lib/SimpleSAML/XML/ErrorsTest.php b/tests/lib/SimpleSAML/XML/ErrorsTest.php
index 38d49317ba8a54476e5b66e3b430af46b5971472..2a6c2e8c71af53104a896d347671794deab2555e 100644
--- a/tests/lib/SimpleSAML/XML/ErrorsTest.php
+++ b/tests/lib/SimpleSAML/XML/ErrorsTest.php
@@ -14,15 +14,14 @@ use SimpleSAML\XML\Errors;
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source
  * code.
  *
+ * @covers \SimpleSAML\XML\Errors
+ *
  * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class ErrorsTest extends TestCase
 {
     /**
-     * @covers \SimpleSAML\XML\Errors::begin
-     * @covers \SimpleSAML\XML\Errors::addErrors
-     * @covers \SimpleSAML\XML\Errors::end
      * @test
      * @return void
      */
@@ -42,8 +41,6 @@ class ErrorsTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\XML\Errors::formatError
-     * @covers \SimpleSAML\XML\Errors::formatErrors
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/XML/ParserTest.php b/tests/lib/SimpleSAML/XML/ParserTest.php
index baac662227b0c4436766256fc70aa9c7806ef91b..accc6c3c07de0eda0d078ffa1ccdfae6c4a297a6 100644
--- a/tests/lib/SimpleSAML/XML/ParserTest.php
+++ b/tests/lib/SimpleSAML/XML/ParserTest.php
@@ -15,6 +15,8 @@ use SimpleSAML\XML\Parser;
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * @covers \SimpleSAML\XML\Parser
  */
 class ParserTest extends TestCase
 {
@@ -39,8 +41,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValue
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -55,8 +55,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValue
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -71,8 +69,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValue
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -84,8 +80,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueDefault
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -100,8 +94,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueAlternatives
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -123,8 +115,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueAlternatives
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -146,8 +136,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueAlternatives
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/XML/SignerTest.php b/tests/lib/SimpleSAML/XML/SignerTest.php
index 57535821d3ee87404132dc9390bed826d60a9e72..2b6463fc1d909c5d771b9396d2466764b5b53e6f 100644
--- a/tests/lib/SimpleSAML/XML/SignerTest.php
+++ b/tests/lib/SimpleSAML/XML/SignerTest.php
@@ -16,6 +16,8 @@ use SimpleSAML\XML\Signer;
 
 /**
  * Tests for SimpleSAML\XML\Signer.
+ *
+ * @covers \SimpleSAML\XML\Signer
  */
 class SignerTest extends SigningTestCase
 {
diff --git a/tests/lib/SimpleSAML/XML/ValidatorTest.php b/tests/lib/SimpleSAML/XML/ValidatorTest.php
index 331b5593143536113fd1a5aaece51be4502b5c92..f79a647ef29d4b888afa22a2f956124b8e2e99a8 100644
--- a/tests/lib/SimpleSAML/XML/ValidatorTest.php
+++ b/tests/lib/SimpleSAML/XML/ValidatorTest.php
@@ -15,6 +15,8 @@ use SimpleSAML\XML\Validator;
 
 /**
  * Tests for SimpleSAML\XML\Validator.
+ *
+ * @covers \SimpleSAML\XML\Validator
  */
 class ValidatorTest extends SigningTestCase
 {
diff --git a/tests/modules/admin/lib/Controller/ConfigTest.php b/tests/modules/admin/lib/Controller/ConfigTest.php
index 67611e0f6da9d377e175373a9fca76f71ea93576..422a685b2ace35ef06008006527dff4f950f6b3e 100644
--- a/tests/modules/admin/lib/Controller/ConfigTest.php
+++ b/tests/modules/admin/lib/Controller/ConfigTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Set of tests for the controllers in the "admin" module.
  *
+ * @covers \SimpleSAML\Module\admin\Controller\Config
  * @package SimpleSAML\Test
  */
 class ConfigTest extends TestCase
diff --git a/tests/modules/admin/lib/Controller/FederationTest.php b/tests/modules/admin/lib/Controller/FederationTest.php
index 761318f83c934cadb1129d3b50a7c0d7c0266e72..c4acde34b6e40825ad498199a8d39ec30c497e04 100644
--- a/tests/modules/admin/lib/Controller/FederationTest.php
+++ b/tests/modules/admin/lib/Controller/FederationTest.php
@@ -21,6 +21,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 /**
  * Set of tests for the controllers in the "admin" module.
  *
+ * @covers \SimpleSAML\Module\admin\Controller\Federation
  * @package SimpleSAML\Test
  */
 class FederationTest extends TestCase
diff --git a/tests/modules/admin/lib/Controller/TestTest.php b/tests/modules/admin/lib/Controller/TestTest.php
index b509f78c404b3b5a013081e3401ecd3ef4a1d86d..881abe700bf23915cf5672a5776a83c5d87fd9b1 100644
--- a/tests/modules/admin/lib/Controller/TestTest.php
+++ b/tests/modules/admin/lib/Controller/TestTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Set of tests for the controllers in the "admin" module.
  *
+ * @covers \SimpleSAML\Module\admin\Controller\Test
  * @package SimpleSAML\Test
  */
 class TestTest extends TestCase
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
index 3e40c73e4c713f707c9efb5fa02635bef2fcf7e2..3c91e2e6f61be37a9ff9815566df7cdc439f62f0 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeAdd;
 
 /**
  * Test for the core:AttributeAdd filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeAdd
  */
 class AttributeAddTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
index 72de230cab29aab1f6a65f4d9f3cb699e16dedf7..d81ca84cc10ab9334eff24f91c804ae196ef202f 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeAlter;
 
 /**
  * Test for the core:AttributeAlter filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeAlter
  */
 class AttributeAlterTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
index 81a2da1c7cedfee2b0dc0afc2e6d2bb336b804b8..ea0323ca5701b55c6ff3e14c25d48635ea5b4a4b 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeCopy;
 
 /**
  * Test for the core:AttributeCopy filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeCopy
  */
 class AttributeCopyTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
index d5453c0d97d68e0de8cb379ef063612ad6d53a5f..9878ba8b245d3351336ce4f3ebcb8b4a8cc471ea 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
@@ -11,6 +11,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeLimit;
 
 /**
  * Test for the core:AttributeLimit filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeLimit
  */
 class AttributeLimitTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
index f8f453e74996cbf2b55dccf94bf05bbbeec57d45..628695e4ddf3fe28acab63c457e09c4b33a792a2 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeMap;
 
 /**
  * Test for the core:AttributeMap filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeMap
  */
 class AttributeMapTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
index 489f2c6b56cc6042087d40ba6fe564368af56d59..0dedcf98e5e457e910cab0731adf6a9e5cdaf5cc 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeValueMap;
 
 /**
  * Test for the core:AttributeValueMap filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeValueMap
  */
 class AttributeValueMapTest extends TestCase
 {
@@ -31,8 +33,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the most basic functionality.
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testBasic(): void
@@ -63,8 +63,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test basic functionality, remove duplicates
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testNoDuplicates(): void
@@ -96,8 +94,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the %replace functionality.
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testReplace(): void
@@ -130,8 +126,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the %keep functionality.
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testKeep(): void
@@ -164,8 +158,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test unknown flag Exception
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testUnknownFlag(): void
@@ -195,8 +187,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test missing Source attribute
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testMissingSourceAttribute(): void
@@ -222,8 +212,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test missing Target attribute
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testMissingTargetAttribute(): void
diff --git a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
index a17bb90cc4e24ba6d332dde6dc8319f27926d0ff..5b62d6d71e43d333158229fdde7fe25828d2d22e 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\CardinalitySingle;
 
 /**
  * Test for the core:CardinalitySingle filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\CardinalitySingle
  */
 class CardinalitySingleTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/CardinalityTest.php b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
index af0262a09f5c6800899ff10644fe49ca00b3b3f4..421b382ed002d3ebde6207b852bcc2a26ee439cf 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalityTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Utils\HttpAdapter;
 
 /**
  * Test for the core:Cardinality filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\Cardinality
  */
 class CardinalityTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/PHPTest.php b/tests/modules/core/lib/Auth/Process/PHPTest.php
index 4be06b9f5583c6d6516c13a623c9b28b11ddd482..bed06c00495b72621d473c322f31839c036aba59 100644
--- a/tests/modules/core/lib/Auth/Process/PHPTest.php
+++ b/tests/modules/core/lib/Auth/Process/PHPTest.php
@@ -11,6 +11,8 @@ use SimpleSAML\Module\core\Auth\Process\PHP;
 
 /**
  * Test for the core:PHP filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\PHP
  */
 class PHPTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php b/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
index a957ddbac1148de541e115d4c4917dab23647ff5..0e45babcb391d150b3d505108c717c500a1e576a 100644
--- a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
+++ b/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Module\core\Auth\Process\ScopeAttribute;
 
 /**
  * Test for the core:ScopeAttribute filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\ScopeAttribute
  */
 class ScopeAttributeTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php b/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
index 12e97018915182e45b000f88be34b33748e73818..010416d30c32c4a6f4b2fce7738e09fcc5af6a46 100644
--- a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
+++ b/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Module\core\Auth\Process\ScopeFromAttribute;
 
 /**
  * Test for the core:ScopeFromAttribute filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\ScopeFromAttribute
  */
 class ScopeFromAttributeTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
index 148d7541fd115d4b75c2b0b4e852f9792d71cb83..2adbddef52d0efd6dee77dac5981203f0e185648 100644
--- a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
+++ b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
@@ -14,6 +14,8 @@ use SimpleSAML\Utils;
 
 /**
  * Test for the core:TargetedID filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\TargetedID
  */
 class TargetedIDTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/UserPassBaseTest.php b/tests/modules/core/lib/Auth/UserPassBaseTest.php
index 84db06b22347f7707928b328def47360b7f8c71c..f0b08669acca637586725044d49441813671b5ac 100644
--- a/tests/modules/core/lib/Auth/UserPassBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassBaseTest.php
@@ -9,6 +9,9 @@ use SAML2\Constants;
 use SimpleSAML\Error\Error as SspError;
 use SimpleSAML\Module\core\Auth\UserPassBase;
 
+/**
+ * @covers \SimpleSAML\Module\core\Auth\UserPassBase
+ */
 class UserPassBaseTest extends TestCase
 {
     /**
diff --git a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
index ebc5f3c6694377fe7c428add297101d2fccd292b..9c472638baca7b8890b06d3fe06dd93693ae2df5 100644
--- a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
@@ -7,6 +7,9 @@ namespace SimpleSAML\Test\Module\core\Auth;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Module\core\Auth\UserPassOrgBase;
 
+/**
+ * @covers \SimpleSAML\Module\core\Auth\UserPassOrgBase
+ */
 class UserPassOrgBaseTest extends TestCase
 {
     /**
diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/lib/Controller/LoginTest.php
index ba7a0b1eebb3040e6f3fdd1c3547778189d482f5..4d06027a7c4d8d13edb5f14d81194bdee1a5c3f2 100644
--- a/tests/modules/core/lib/Controller/LoginTest.php
+++ b/tests/modules/core/lib/Controller/LoginTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\HttpFoundation\Request;
  * For now, this test extends ClearStateTestCase so that it doesn't interfere with other tests. Once every class has
  * been made PSR-7-aware, that won't be necessary any longer.
  *
+ * @covers \SimpleSAML\Module\core\Controller\Login
  * @package SimpleSAML\Test
  */
 class LoginTest extends ClearStateTestCase
diff --git a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php b/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
index ea6441bf469ca883c9b365b63115cceac00ac57e..21d884d5f05dd33dbe0f26ca545e3d36100feeac 100644
--- a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
+++ b/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Storage\SQLPermanentStorage;
 
 /**
  * Test for the SQLPermanentStorage class.
+ *
+ * @covers \SimpleSAML\Module\core\Storage\SQLPermanentStorage
  */
 class SQLPermanentStorageTest extends TestCase
 {
diff --git a/tests/modules/cron/lib/Controller/CronTest.php b/tests/modules/cron/lib/Controller/CronTest.php
index 687d35f72e8752b5a9bea74e0f0cc2e40b3d4bda..637efae13aa7cc599dbb458a7f36fd3a0be32c69 100644
--- a/tests/modules/cron/lib/Controller/CronTest.php
+++ b/tests/modules/cron/lib/Controller/CronTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Set of tests for the controllers in the "cron" module.
  *
+ * @covers \SimpleSAML\Module\cron\Controller\Cron
  * @package SimpleSAML\Test
  */
 class CronTest extends TestCase
diff --git a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
index 879a6b4da632e428a869e6220b135bcae1b94096..4862f120f0b48548d32ea7a6c8f77a51967bd8ed 100644
--- a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
+++ b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
@@ -10,6 +10,9 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\multiauth\Auth\Source\MultiAuth;
 
+/**
+ * @covers \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth
+ */
 class MultiAuthTest extends ClearStateTestCase
 {
     /** @var Configuration */
diff --git a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
index 764d3caa70270e7cb4fcaacc16b48ad68926e8ae..9b5296fbe702e694f4ad09b9313fb36a00d877b4 100644
--- a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
+++ b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\saml\Auth\Process\FilterScopes;
 /**
  * Test for the saml:FilterScopes filter.
  *
+ * @covers \SimpleSAML\Module\saml\Auth\Process\FilterScopes
+ *
  * @author Jaime PĂ©rez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
diff --git a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
index fa45d32b42fa1a2345f636a6e5b90f246f61cc76..4649f38367e7fa95983b5acc87551c04e3716d6f 100644
--- a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
+++ b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
@@ -13,6 +13,8 @@ use SAML2\Constants;
 /**
  * Test for the saml:NameIDAttribute filter.
  *
+ * @covers \SimpleSAML\Module\saml\Auth\Process\NameIDAttribute
+ *
  * @author Eugene Venter <eugene@catalyst.net.nz>
  * @package SimpleSAMLphp
  */
diff --git a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
index 5baa54d1f7aeb35ea75727adab4b65bf1b86eba8..397482f18b01ea253edb45be013b9f13881edd91 100644
--- a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
+++ b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
@@ -19,6 +19,8 @@ use SimpleSAML\Test\Utils\SpTester;
 
 /**
  * Set of test cases for \SimpleSAML\Module\saml\Auth\Source\SP.
+ *
+ * @covers \SimpleSAML\Module\saml\Auth\Source\SP
  */
 class SPTest extends ClearStateTestCase
 {
diff --git a/tests/modules/saml/lib/IdP/SAML2Test.php b/tests/modules/saml/lib/IdP/SAML2Test.php
index 301c1c72ef977dbfeea49d2c80e1ac23fa598050..c0affe8340657e9bbdd553d749dc9bea14215c30 100644
--- a/tests/modules/saml/lib/IdP/SAML2Test.php
+++ b/tests/modules/saml/lib/IdP/SAML2Test.php
@@ -9,6 +9,9 @@ use SimpleSAML\IdP;
 use SimpleSAML\Module\saml\IdP\SAML2;
 use SimpleSAML\Test\Utils\ClearStateTestCase;
 
+/**
+ * @covers \SimpleSAML\Module\saml\IdP\SAML2
+ */
 class SAML2Test extends ClearStateTestCase
 {
     /**
diff --git a/tests/modules/saml/lib/IdP/SQLNameIDTest.php b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
index 1149a59d50dd976b70d0f741fe32150fb4f0e393..181b2d64bbea461614ff6b7ee578fb7542f0a095 100644
--- a/tests/modules/saml/lib/IdP/SQLNameIDTest.php
+++ b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
@@ -14,6 +14,8 @@ use SimpleSAML\Store;
 /**
  * Test for the SQLNameID helper class.
  *
+ * @covers \SimpleSAML\Module\saml\IdP\SQLNameID
+ *
  * @author Pavel Brousek <brousek@ics.muni.cz>
  * @package SimpleSAMLphp
  */