diff --git a/tests/Unit/Config/BrewSessionConfigTest.php b/tests/Unit/Config/BrewSessionConfigTest.php
index bab4dfb..e521b24 100644
--- a/tests/Unit/Config/BrewSessionConfigTest.php
+++ b/tests/Unit/Config/BrewSessionConfigTest.php
@@ -5,21 +5,16 @@
 namespace steinmb\Tests\Unit\Config;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use steinmb\AmbiguousSessionId;
-use steinmb\BrewSession;
 use steinmb\BrewSessionConfig;
 use steinmb\BrewSessionInterface;
 use steinmb\Onewire\OneWireFixed;
 use steinmb\Onewire\SensorFactory;
-use steinmb\Onewire\TemperatureSensor;
 
 #[CoversClass(BrewSessionConfig::class)]
-#[CoversClass(AmbiguousSessionId::class)]
-#[CoversClass(BrewSession::class)]
-#[CoversClass(OneWireFixed::class)]
-#[CoversClass(SensorFactory::class)]
-#[CoversClass(TemperatureSensor::class)]
+#[UsesClass(AmbiguousSessionId::class)]
 final class BrewSessionConfigTest extends TestCase
 {
     private BrewSessionConfig $brewSessionConfig;
diff --git a/tests/Unit/Formatters/HTMLFormatterTest.php b/tests/Unit/Formatters/HTMLFormatterTest.php
index f33ec7c..bfb5713 100644
--- a/tests/Unit/Formatters/HTMLFormatterTest.php
+++ b/tests/Unit/Formatters/HTMLFormatterTest.php
@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use steinmb\Enums\DateFormat;
 use steinmb\Formatters\HTMLFormatter;
 use PHPUnit\Framework\TestCase;
@@ -13,8 +14,7 @@
 use steinmb\Utils\Trend;
 
 #[CoversClass(HTMLFormatter::class)]
-#[CoversClass(SystemClockFixed::class)]
-#[CoversClass(Trend::class)]
+#[UsesClass(SystemClockFixed::class)]
 final class HTMLFormatterTest extends TestCase
 {
     private SystemClockFixed $timestamp;
diff --git a/tests/Unit/Logger/Handlers/FileStorageHandlerTest.php b/tests/Unit/Logger/Handlers/FileStorageHandlerTest.php
index 68abd8d..e36b394 100644
--- a/tests/Unit/Logger/Handlers/FileStorageHandlerTest.php
+++ b/tests/Unit/Logger/Handlers/FileStorageHandlerTest.php
@@ -5,12 +5,13 @@
 namespace steinmb\Tests\Unit\Logger\Handlers;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use steinmb\Formatters\NullFormatter;
 use steinmb\Logger\Handlers\FileStorageHandler;
 
 #[CoversClass(FileStorageHandler::class)]
-#[CoversClass(NullFormatter::class)]
+#[UsesClass(NullFormatter::class)]
 final class FileStorageHandlerTest extends TestCase
 {
     private const string TEST_DIRECTORY =  __DIR__ . '/Fixtures';
diff --git a/tests/Unit/Logger/LoggerTest.php b/tests/Unit/Logger/LoggerTest.php
index 78778ff..8ec2d51 100644
--- a/tests/Unit/Logger/LoggerTest.php
+++ b/tests/Unit/Logger/LoggerTest.php
@@ -5,12 +5,13 @@
 namespace steinmb\Tests\Unit\Logger;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use steinmb\Logger\Handlers\NullHandler;
 use steinmb\Logger\Logger;
 
 #[CoversClass(Logger::class)]
-#[CoversClass(NullHandler::class)]
+#[UsesClass(NullHandler::class)]
 final class LoggerTest extends TestCase
 {
     private Logger $logger;
diff --git a/tests/Unit/Temperature/TemperatureTest.php b/tests/Unit/Temperature/TemperatureTest.php
index 84bebb7..d62e143 100644
--- a/tests/Unit/Temperature/TemperatureTest.php
+++ b/tests/Unit/Temperature/TemperatureTest.php
@@ -5,9 +5,9 @@
 namespace steinmb\Tests\Unit\Temperature;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use steinmb\Alarm;
-use steinmb\BrewSession;
 use steinmb\BrewSessionConfig;
 use steinmb\Onewire\OneWireFixed;
 use steinmb\Onewire\SensorFactory;
@@ -15,11 +15,7 @@
 use UnexpectedValueException;
 
 #[CoversClass(TemperatureSensor::class)]
-#[CoversClass(OneWireFixed::class)]
-#[CoversClass(SensorFactory::class)]
-#[CoversClass(Alarm::class)]
-#[CoversClass(BrewSessionConfig::class)]
-#[CoversClass(BrewSession::class)]
+#[UsesClass(OneWireFixed::class)]
 final class TemperatureTest extends TestCase
 {
     private SensorFactory $sensorFactory;
diff --git a/tests/Unit/Utils/CalculateTest.php b/tests/Unit/Utils/CalculateTest.php
index 52e92a8..2937cd9 100644
--- a/tests/Unit/Utils/CalculateTest.php
+++ b/tests/Unit/Utils/CalculateTest.php
@@ -5,6 +5,7 @@
 namespace steinmb\Tests\Unit\Utils;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use steinmb\Logger\Logger;
 use steinmb\Utils\Calculate;
@@ -12,8 +13,7 @@
 use UnexpectedValueException;
 
 #[CoversClass(Calculate::class)]
-#[CoversClass(Trend::class)]
-#[CoversClass(Logger::class)]
+#[UsesClass(Trend::class)]
 final class CalculateTest extends TestCase
 {
     private array $values;
diff --git a/tests/Unit/Utils/TrendTest.php b/tests/Unit/Utils/TrendTest.php
index d493b40..c31db5b 100644
--- a/tests/Unit/Utils/TrendTest.php
+++ b/tests/Unit/Utils/TrendTest.php
@@ -5,16 +5,14 @@
 namespace steinmb\Tests\Unit\Utils;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 use steinmb\Enums\TrendFormat;
 use steinmb\Utils\Calculate;
 use steinmb\Utils\Trend;
-use steinmb\ValueObjects\Range;
 
 #[CoversClass(Trend::class)]
-#[CoversClass(TrendFormat::class)]
-#[CoversClass(Calculate::class)]
-#[CoversClass(Range::class)]
+#[UsesClass(TrendFormat::class)]
 final class TrendTest extends TestCase
 {
     public function testCalculateTrend(): void
@@ -43,24 +41,6 @@ public function testCalculateTrend(): void
 
     public function testCreateTrendLabels(): void
     {
-//        $trend = new Trend(0.21);
-//        $foo = TrendFormat::Stable->speed();
-//        $bar = TrendFormat::Slowly->value;
-//        $foobar = $foo->withinRange(0.21);
-//        $trend = new Trend(0.11);
-//        $result = $trend->createTrendLabels();
-
-//        self::assertEquals(TrendFormat::Stable->value, $this->trend->createTrendLabels());
-//        self::assertEquals(TrendFormat::Stable->value, $trend->createTrendLabels());
-//
-//        $trend = new Trend(TrendFormat::Slowly->speed());
-//        $expected_result = TrendFormat::Slowly->value . ' increasing (' . TrendFormat::Slowly->speed() . ')';
-//        self::assertEquals($expected_result, $trend->createTrendLabels());
-//
-//        $trend = new Trend(TrendFormat::Fast->speed());
-//        $expected_result = TrendFormat::Fast->value . ' increasing (' . TrendFormat::Fast->speed() . ')';
-//        self::assertEquals($expected_result, $trend->createTrendLabels());
-
         $trend = new Trend(0.1);
         self::assertEquals(
             'stable',