PHPUnit 11 deprecates docblocks, use annotations instead

192 files changed, 755 insertions, 2633 deletions

diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
index a48cdb7559..49cb99559e 100644
--- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAgeFemale5Years
- */
+
+#[CoversClass(CensusColumnAgeFemale5Years::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeFemale5YearsTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -44,10 +41,6 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +55,6 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
         self::assertSame('30', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -80,10 +69,6 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
         self::assertSame('30', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testLessThanOneYear(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -98,10 +83,6 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
         self::assertSame('0', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testLessThanFifteenYears(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -116,10 +97,6 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
         self::assertSame('14', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testRoundedDownToFiveYears(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php
index 62ce74414f..144433bdb7 100644
--- a/tests/app/Census/CensusColumnAgeFemaleTest.php
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAgeFemale
- */
+
+#[CoversClass(CensusColumnAgeFemale::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeFemaleTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -44,10 +41,6 @@ class CensusColumnAgeFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +55,6 @@ class CensusColumnAgeFemaleTest extends TestCase
         self::assertSame('32', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -80,10 +69,6 @@ class CensusColumnAgeFemaleTest extends TestCase
         self::assertSame('32', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testLessThanOneYear(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
index 249b377086..78dbda3a67 100644
--- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAgeMale5Years5Years
- */
+
+#[CoversClass(CensusColumnAgeMale5Years::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeMale5YearsTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -46,10 +43,6 @@ class CensusColumnAgeMale5YearsTest extends TestCase
         self::assertSame('30', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +55,6 @@ class CensusColumnAgeMale5YearsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -80,10 +69,6 @@ class CensusColumnAgeMale5YearsTest extends TestCase
         self::assertSame('30', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testLessThanOneYear(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -98,10 +83,6 @@ class CensusColumnAgeMale5YearsTest extends TestCase
         self::assertSame('0', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testLessThanFifteenYears(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -116,10 +97,6 @@ class CensusColumnAgeMale5YearsTest extends TestCase
         self::assertSame('14', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testRoundedDownToFiveYears(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php
index ab4b1ed1a0..4dde44edfe 100644
--- a/tests/app/Census/CensusColumnAgeMaleTest.php
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAgeMale
- */
+
+#[CoversClass(CensusColumnAgeMale::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeMaleTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -46,10 +43,6 @@ class CensusColumnAgeMaleTest extends TestCase
         self::assertSame('32', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +55,6 @@ class CensusColumnAgeMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -80,10 +69,6 @@ class CensusColumnAgeMaleTest extends TestCase
         self::assertSame('32', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testLessThanOneYear(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index bd554a93f1..3be6b6d7ba 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAgeMarried
- */
+
+#[CoversClass(CensusColumnAgeMarried::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeMarriedTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testAgeMarried(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -55,10 +52,6 @@ class CensusColumnAgeMarriedTest extends TestCase
         self::assertSame('19', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoBirthDate(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -73,10 +66,6 @@ class CensusColumnAgeMarriedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoMarriage(): void
     {
         $family = $this->createMock(Family::class);
@@ -94,10 +83,6 @@ class CensusColumnAgeMarriedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoSpouseFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
index 149f938fe5..06c246d06f 100644
--- a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
+++ b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAgeNextBirthDay
- */
+
+#[CoversClass(CensusColumnAgeNextBirthDay::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeNextBirthDayTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeNextBirthDay
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php
index bde2a10a2d..4f2d99925c 100644
--- a/tests/app/Census/CensusColumnAgeTest.php
+++ b/tests/app/Census/CensusColumnAgeTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAge
- */
+
+#[CoversClass(CensusColumnAge::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnAgeTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnAge
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php
index 0d95833e23..7b574ede81 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAge
- */
+
+#[CoversClass(CensusColumnBirthDate::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthDateTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDate
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
index ca85765fe6..2275f00a18 100644
--- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthDayDotMonthYearTest
- */
+
+#[CoversClass(CensusColumnBirthDayDotMonthYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthDayDotMonthYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayDotMonthYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
index 2c31565a67..9c1dc57066 100644
--- a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthDayMonthSlashYearTest
- */
+
+#[CoversClass(CensusColumnBirthDayMonthYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthDayMonthYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayMonthYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
index e737cc79cc..b7e3270cfa 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthDaySlashMonthTest
- */
+
+#[CoversClass(CensusColumnBirthDaySlashMonth::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthDaySlashMonthTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
index 77d019b7f4..6f5f805b84 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthDaySlashMonthYearTest
- */
+
+#[CoversClass(CensusColumnBirthDaySlashMonthYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthDaySlashMonthYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php
index 43be7e6790..7c7953f728 100644
--- a/tests/app/Census/CensusColumnBirthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthDayTest.php
@@ -23,16 +23,13 @@ use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAge
- */
+
+#[CoversClass(CensusColumnBirthDay::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthDayTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDay
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $cal_date = $this->createMock(GregorianDate::class);
diff --git a/tests/app/Census/CensusColumnBirthMonthDayTest.php b/tests/app/Census/CensusColumnBirthMonthDayTest.php
index 7ea366cc59..7dde0439e5 100644
--- a/tests/app/Census/CensusColumnBirthMonthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthDayTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthDayMonthSlashYearTest
- */
+
+#[CoversClass(CensusColumnBirthMonthDay::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthMonthDayTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthMonthDay
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php
index 29f75f5ecd..b15c64b04b 100644
--- a/tests/app/Census/CensusColumnBirthMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthTest.php
@@ -23,16 +23,13 @@ use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAge
- */
+
+#[CoversClass(CensusColumnBirthMonth::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthMonthTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthMonth
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $cal_date = $this->createMock(GregorianDate::class);
diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
index 4f66a1715c..d82d7d456e 100644
--- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
@@ -22,10 +22,11 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthPlaceSimple
- */
+
+#[CoversClass(CensusColumnBirthPlaceSimple::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthPlaceSimpleTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -36,10 +37,6 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testForeignCountry(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -53,10 +50,6 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
         self::assertSame('England', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testJustCountry(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -70,10 +63,6 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testKnownState(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -87,10 +76,6 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
         self::assertSame('Maryland', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testKnownStateAndTown(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php
index 1651e42e24..70d57084ab 100644
--- a/tests/app/Census/CensusColumnBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceTest.php
@@ -22,10 +22,11 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBirthPlace
- */
+
+#[CoversClass(CensusColumnBirthPlace::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthPlaceTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -36,10 +37,6 @@ class CensusColumnBirthPlaceTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceCountry(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -53,10 +50,6 @@ class CensusColumnBirthPlaceTest extends TestCase
         self::assertSame('Westminster, London', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceAndCountry(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -70,10 +63,6 @@ class CensusColumnBirthPlaceTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testDifferentCountry(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php
index e8b14c5488..18ee3b99d3 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -23,16 +23,13 @@ use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnAge
- */
+
+#[CoversClass(CensusColumnBirthYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBirthYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGenerateColumn(): void
     {
         $cal_date = $this->createMock(GregorianDate::class);
diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php
index beafec70b1..ce1a5854b7 100644
--- a/tests/app/Census/CensusColumnBornForeignPartsTest.php
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -23,10 +23,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnBornForeignParts
- */
+
+#[CoversClass(CensusColumnBornForeignParts::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnBornForeignPartsTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -40,10 +41,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornEnglandCensusEngland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -57,10 +54,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornWalesCensusEngland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -74,10 +67,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornScotlandCensusEngland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -91,10 +80,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornIrelandCensusEngland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -108,10 +93,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('I', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornForeignCensusEngland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -125,10 +106,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('F', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornEnglandCensusIreland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -142,10 +119,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('E', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornWalesCensusIreland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -159,10 +132,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('E', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornScotlandCensusIreland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -176,10 +145,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornIrelandCensusIreland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -193,10 +158,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornForeignCensusIreland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -210,10 +171,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('F', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornEnglandCensusScotland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -227,10 +184,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('E', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornWalesCensusScotland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -244,10 +197,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('E', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornScotlandCensusScotland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -261,10 +210,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornIrelandCensusScotland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -278,10 +223,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('I', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornForeignCensusScotland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -295,10 +236,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('F', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornEnglandCensusWales(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -312,10 +249,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornWalesCensusWales(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -329,10 +262,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornScotlandCensusWales(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -346,10 +275,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornIrelandCensusWales(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -363,10 +288,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('I', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornForeignCensusWales(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -380,10 +301,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('F', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornNowhereCensusEngland(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -397,10 +314,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornNowhereCensusWales(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -414,10 +327,6 @@ class CensusColumnBornForeignPartsTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornNowhereCensusScotland(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
index a18d9a1b89..2295b308d9 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -24,16 +24,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnChildrenBornAlive
- */
+
+#[CoversClass(CensusColumnChildrenBornAlive::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnChildrenBornAliveTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -47,10 +44,6 @@ class CensusColumnChildrenBornAliveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testCountChildren(): void
     {
         // Stillborn
diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php
index 02a36855da..4d884c890a 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -24,16 +24,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnChildrenDied
- */
+
+#[CoversClass(CensusColumnChildrenDied::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnChildrenDiedTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenDied
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -47,10 +44,6 @@ class CensusColumnChildrenDiedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenDied
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testCountChildren(): void
     {
         // Stillborn
diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php
index c2310c99b8..668548bfc2 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -24,16 +24,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnChildrenLiving
- */
+
+#[CoversClass(CensusColumnChildrenLiving::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnChildrenLivingTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenLiving
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -47,10 +44,6 @@ class CensusColumnChildrenLivingTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenLiving
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testCountChildren(): void
     {
         // Stillborn
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
index 307ca2b7b7..0ab7af6503 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionCanadaMarriedSingle
- */
+
+#[CoversClass(CensusColumnConditionCanadaMarriedSingle::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -184,10 +161,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -207,10 +180,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -230,10 +199,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -253,10 +218,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -276,10 +237,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -307,10 +264,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -338,10 +291,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -369,10 +318,6 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedSingle
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
index 786339dd75..f2ca24d55f 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionCanadaMarriedWidowed
- */
+
+#[CoversClass(CensusColumnConditionCanadaMarriedWidowed::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -184,10 +161,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -207,10 +180,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -230,10 +199,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -253,10 +218,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -276,10 +237,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -307,10 +264,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -338,10 +291,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -369,10 +318,6 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaMarriedWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaTest.php b/tests/app/Census/CensusColumnConditionCanadaTest.php
index 52644e7066..74493771f9 100644
--- a/tests/app/Census/CensusColumnConditionCanadaTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaTest.php
@@ -25,17 +25,12 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionCanada
- * Copied from CensusColumnConditionUs
- */
+#[CoversClass(CensusColumnConditionCanada::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionCanadaTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -51,10 +46,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -70,10 +61,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -93,10 +80,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -116,10 +99,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -150,10 +129,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -185,10 +160,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -208,10 +179,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -231,10 +198,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -254,10 +217,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -277,10 +236,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -308,10 +263,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('D', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -339,10 +290,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('D', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -370,10 +317,6 @@ class CensusColumnConditionCanadaTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanada
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
index 1644f0604b..8e09c48e7e 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionCanadaWidowedFemale
- */
+
+#[CoversClass(CensusColumnConditionCanadaWidowedFemale::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -184,10 +161,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -207,10 +180,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -230,10 +199,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -253,10 +218,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -276,10 +237,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -307,10 +264,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -338,10 +291,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -369,10 +318,6 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedFemale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
index 09efe42476..bd3eddf8ac 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionCanadaWidowedMale
- */
+
+#[CoversClass(CensusColumnConditionCanadaWidowedMale::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -184,10 +161,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -207,10 +180,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -230,10 +199,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -253,10 +218,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -276,10 +237,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -307,10 +264,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -338,10 +291,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -369,10 +318,6 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowedMale
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
index f6dff74ce1..b856422436 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionCanadaWidowed
- */
+
+#[CoversClass(CensusColumnConditionCanadaWidowed::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionCanadaWidowedTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -184,10 +161,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -207,10 +180,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -230,10 +199,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -253,10 +218,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -276,10 +237,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -307,10 +264,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -338,10 +291,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -369,10 +318,6 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCanadaWidowed
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 0be596e1f6..3d33994343 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionDanish
- */
+
+#[CoversClass(CensusColumnConditionDanish::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionDanishTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Ugift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Ugift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Ugift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Ugift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Gift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Gift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Ugift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Ugift', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionDanishTest extends TestCase
         self::assertSame('Skilt', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index ff2fa18a4f..41b8446777 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionEnglish
- */
+
+#[CoversClass(CensusColumnConditionEnglish::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionEnglishTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Unm', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Unm', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Unm', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Unm', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Wid', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Wid', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Unm', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Unm', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionEnglishTest extends TestCase
         self::assertSame('Div', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index ded467c112..d381487a74 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionFrenchFemme
- */
+
+#[CoversClass(CensusColumnConditionFrenchFemme::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionFrenchFemmeTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 40815dfa77..14f4bdbc4b 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionFrenchFille
- */
+
+#[CoversClass(CensusColumnConditionFrenchFille::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionFrenchFilleTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index 290f9e50d6..f8d1c26791 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionFrenchGarcon
- */
+
+#[CoversClass(CensusColumnConditionFrenchGarcon::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionFrenchGarconTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index d89c9f82ff..d180d4d681 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionFrenchHomme
- */
+
+#[CoversClass(CensusColumnConditionFrenchHomme::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionFrenchHommeTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index cca1c20ee9..b90c862224 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionFrenchVeuf
- */
+
+#[CoversClass(CensusColumnConditionFrenchVeuf::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionFrenchVeufTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -183,10 +160,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -206,10 +179,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -229,10 +198,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -252,10 +217,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -275,10 +236,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -305,10 +262,6 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 42660264bf..7b476ae2ce 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionFrenchVeuve
- */
+
+#[CoversClass(CensusColumnConditionFrenchVeuve::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionFrenchVeuveTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -150,10 +131,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -185,10 +162,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('1', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -208,10 +181,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -231,10 +200,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -254,10 +219,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -277,10 +238,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -308,10 +265,6 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 4b33234799..308c442c6a 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnConditionUs
- */
+
+#[CoversClass(CensusColumnConditionUs::class)]
+#[CoversClass(AbstractCensusColumnCondition::class)]
 class CensusColumnConditionUsTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -50,10 +47,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoSpouseFamiliesFemale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -69,10 +62,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -92,10 +81,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyFactsFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -115,10 +100,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -149,10 +130,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testSpouseDeadFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -184,10 +161,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('W', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -207,10 +180,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testNoFamilyUnmarriedFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -230,10 +199,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildMale(): void
     {
         $family = $this->createMock(Family::class);
@@ -253,10 +218,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testChildFemale(): void
     {
         $family = $this->createMock(Family::class);
@@ -276,10 +237,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('S', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -307,10 +264,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('D', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testDivorcedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -338,10 +291,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('D', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedMale(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -369,10 +318,6 @@ class CensusColumnConditionUsTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
-     */
     public function testMarriedFemale(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
index aa4d2e0c73..f4dd0fe034 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
@@ -24,10 +24,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnFatherBirthPlaceSimple
- */
+
+#[CoversClass(CensusColumnFatherBirthPlaceSimple::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnFatherBirthPlaceSimpleTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -41,10 +42,6 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testKnownStateAndTown(): void
     {
         $father = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
index ed92eabbcd..1980434298 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
@@ -24,10 +24,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnFatherBirthPlace
- */
+
+#[CoversClass(CensusColumnFatherBirthPlace::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnFatherBirthPlaceTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -41,10 +42,6 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testSameCountry(): void
     {
         $father = $this->createMock(Individual::class);
@@ -64,10 +61,6 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
         self::assertSame('London', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testDifferentCountry(): void
     {
         $father = $this->createMock(Individual::class);
@@ -87,10 +80,6 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
         self::assertSame('London, England', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParent(): void
     {
         $family = $this->createMock(Family::class);
@@ -107,10 +96,6 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParentFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php
index 1f5ab64956..355a561b34 100644
--- a/tests/app/Census/CensusColumnFatherForeignTest.php
+++ b/tests/app/Census/CensusColumnFatherForeignTest.php
@@ -24,10 +24,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnFatherForeign
- */
+
+#[CoversClass(CensusColumnFatherForeign::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnFatherForeignTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -38,10 +39,6 @@ class CensusColumnFatherForeignTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testSameCountry(): void
     {
         $father = $this->createMock(Individual::class);
@@ -61,10 +58,6 @@ class CensusColumnFatherForeignTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testDifferentCountry(): void
     {
         $father = $this->createMock(Individual::class);
@@ -84,10 +77,6 @@ class CensusColumnFatherForeignTest extends TestCase
         self::assertSame('Y', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParent(): void
     {
         $family = $this->createMock(Family::class);
@@ -104,10 +93,6 @@ class CensusColumnFatherForeignTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFatherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParentFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index e53f5121d1..4e4d6112d4 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnFullName
- */
+
+#[CoversClass(CensusColumnFullName::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnFullNameTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFullName
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function xxxtestFullName(): void
     {
         $individual = $this->createStub(Individual::class);
@@ -49,10 +46,6 @@ class CensusColumnFullNameTest extends TestCase
         self::assertSame('Joe Bloggs', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnFullName
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedName(): void
     {
         $wife_names = [
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index 8c7297162a..b33c3537bc 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnGivenNameInitial
- */
+
+#[CoversClass(CensusColumnGivenNameInitial::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnGivenNameInitialTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNameInitial
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testOneGivenName(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -43,10 +40,6 @@ class CensusColumnGivenNameInitialTest extends TestCase
         self::assertSame('Joe', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNameInitial
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMultipleGivenNames(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -59,10 +52,6 @@ class CensusColumnGivenNameInitialTest extends TestCase
         self::assertSame('Joe F', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNameInitial
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoName(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index 1d056e376c..05abd006e6 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnGivenNames
- */
+
+#[CoversClass(CensusColumnGivenNames::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnGivenNamesTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNames
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testGivenNames(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -43,10 +40,6 @@ class CensusColumnGivenNamesTest extends TestCase
         self::assertSame('Joe', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNames
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoName(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 34f7cbc8c5..0b83bbef92 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnMarriedWithinYear
- */
+
+#[CoversClass(CensusColumnMarriedWithinYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnMarriedWithinYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedWithinYear(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -54,10 +51,6 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         self::assertSame('Y', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedOverYearBeforeTheCensus(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -77,10 +70,6 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedAfterTheCensus(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -100,10 +89,6 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoMarriage(): void
     {
         $family = $this->createMock(Family::class);
@@ -120,10 +105,6 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoSpouseFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
index cbd09d14ca..6ee40f0897 100644
--- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnMonthIfBornWithinYear
- */
+
+#[CoversClass(CensusColumnMonthIfBornWithinYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnMonthIfBornWithinYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornWithinYear(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -45,10 +42,6 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
         self::assertSame('Jan', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornOverYearBeforeTheCensus(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +55,6 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBornAfterTheCensus(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -81,10 +70,6 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
     }
 
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoBirth(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index c8b663c673..c2d4499f15 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnMonthIfMarriedWithinYear
- */
+
+#[CoversClass(CensusColumnMonthIfMarriedWithinYear::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedWithinYear(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -54,10 +51,6 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         self::assertSame('Dec', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedOverYearBeforeTheCensus(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -77,10 +70,6 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriedAfterTheCensus(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -100,10 +89,6 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoMarriage(): void
     {
         $family = $this->createMock(Family::class);
@@ -120,10 +105,6 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoSpouseFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
index 4c62799e38..23a8f003a7 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
@@ -24,10 +24,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnMotherBirthPlaceSimple
- */
+
+#[CoversClass(CensusColumnMotherBirthPlaceSimple::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnMotherBirthPlaceSimpleTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -41,10 +42,6 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testKnownStateAndTown(): void
     {
         $father = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
index 198b565762..38a5e175d2 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
@@ -24,10 +24,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnMotherBirthPlace
- */
+
+#[CoversClass(CensusColumnMotherBirthPlace::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnMotherBirthPlaceTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -41,10 +42,6 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testSameCountry(): void
     {
         $mother = $this->createMock(Individual::class);
@@ -64,10 +61,6 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
         self::assertSame('London', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testDifferentCountry(): void
     {
         $mother = $this->createMock(Individual::class);
@@ -87,10 +80,6 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
         self::assertSame('London, England', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParent(): void
     {
         $family = $this->createMock(Family::class);
@@ -107,10 +96,6 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlace
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParentFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php
index 74b03e8d44..0a944509b9 100644
--- a/tests/app/Census/CensusColumnMotherForeignTest.php
+++ b/tests/app/Census/CensusColumnMotherForeignTest.php
@@ -24,10 +24,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnMotherForeign
- */
+
+#[CoversClass(CensusColumnMotherForeign::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnMotherForeignTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -38,10 +39,6 @@ class CensusColumnMotherForeignTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testSameCountry(): void
     {
         $mother = $this->createMock(Individual::class);
@@ -61,10 +58,6 @@ class CensusColumnMotherForeignTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testDifferentCountry(): void
     {
         $mother = $this->createMock(Individual::class);
@@ -84,10 +77,6 @@ class CensusColumnMotherForeignTest extends TestCase
         self::assertSame('Y', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParent(): void
     {
         $family = $this->createMock(Family::class);
@@ -104,10 +93,6 @@ class CensusColumnMotherForeignTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnMotherForeign
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceNoParentFamily(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index cd5457d2e1..6dadc0ac90 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -25,10 +25,11 @@ use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnNationality
- */
+
+#[CoversClass(CensusColumnNationality::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnNationalityTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
@@ -39,10 +40,6 @@ class CensusColumnNationalityTest extends TestCase
         return $placeMock;
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnNationality
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoBirthPlace(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -57,10 +54,6 @@ class CensusColumnNationalityTest extends TestCase
         self::assertSame('Deutsch', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnNationality
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testPlaceCountry(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -75,10 +68,6 @@ class CensusColumnNationalityTest extends TestCase
         self::assertSame('Australia', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnNationality
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testBritish(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -93,10 +82,6 @@ class CensusColumnNationalityTest extends TestCase
         self::assertSame('British', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnNationality
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testEmigrated(): void
     {
         $place1 = $this->createMock(Place::class);
diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php
index ec83370749..ea4da9b342 100644
--- a/tests/app/Census/CensusColumnNullTest.php
+++ b/tests/app/Census/CensusColumnNullTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnNull
- */
+
+#[CoversClass(CensusColumnNull::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnNullTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnNull
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNull(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index f80bf27f3e..07104a8060 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -23,16 +23,13 @@ use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnOccupation
- */
+
+#[CoversClass(CensusColumnOccupation::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnOccupationTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnOccupation
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoOccupation(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -45,10 +42,6 @@ class CensusColumnOccupationTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnOccupation
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testOccupation(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
index a7d7e058ea..5864ce5cab 100644
--- a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
@@ -21,17 +21,14 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnRelationToHead
- */
+
+#[CoversClass(CensusColumnRelationToHeadEnglish::class)]
+#[CoversClass(CensusColumnRelationToHead::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnRelationToHeadEnglishTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHeadEnglish
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHead
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNull(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
index cdeb045e18..5a1c734899 100644
--- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
@@ -21,17 +21,14 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnRelationToHead
- */
+
+#[CoversClass(CensusColumnRelationToHeadGerman::class)]
+#[CoversClass(CensusColumnRelationToHead::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnRelationToHeadGermanTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHeadGerman
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHead
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNull(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php
index dc36ae397d..742967b01e 100644
--- a/tests/app/Census/CensusColumnRelationToHeadTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnRelationToHead
- */
+
+#[CoversClass(CensusColumnRelationToHead::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnRelationToHeadTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHead
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNull(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 3834a11a44..6c79276327 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -23,16 +23,13 @@ use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnReligion
- */
+
+#[CoversClass(CensusColumnReligion::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnReligionTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnReligion
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoReligion(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -49,10 +46,6 @@ class CensusColumnReligionTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnReligion
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testRecordReligion(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -67,10 +60,6 @@ class CensusColumnReligionTest extends TestCase
         self::assertSame('Jedi', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnReligion
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testEventReligion(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSexFTest.php b/tests/app/Census/CensusColumnSexFTest.php
index 9cf3a83a8d..2ec5822824 100644
--- a/tests/app/Census/CensusColumnSexFTest.php
+++ b/tests/app/Census/CensusColumnSexFTest.php
@@ -21,19 +21,12 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSexF
- *
- * X is the value expected for Female, as only the M or F column is expected
- * to be marked.
- */
+#[CoversClass(CensusColumnSexF::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSexFTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexF
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -46,10 +39,6 @@ class CensusColumnSexFTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexF
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFeale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +51,6 @@ class CensusColumnSexFTest extends TestCase
         self::assertSame('X', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexF
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php
index 6f1e9e6214..c70d71e6eb 100644
--- a/tests/app/Census/CensusColumnSexMFTest.php
+++ b/tests/app/Census/CensusColumnSexMFTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSexMF
- */
+
+#[CoversClass(CensusColumnSexMF::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSexMFTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMF
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -43,10 +40,6 @@ class CensusColumnSexMFTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMF
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFeale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -59,10 +52,6 @@ class CensusColumnSexMFTest extends TestCase
         self::assertSame('F', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMF
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
index 980a630a22..3f490728c2 100644
--- a/tests/app/Census/CensusColumnSexMKTest.php
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSexMK
- */
+
+#[CoversClass(CensusColumnSexMK::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSexMKTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMK
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -43,10 +40,6 @@ class CensusColumnSexMKTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMK
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFeale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -59,10 +52,6 @@ class CensusColumnSexMKTest extends TestCase
         self::assertSame('K', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMK
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSexMTest.php b/tests/app/Census/CensusColumnSexMTest.php
index 284a0e0312..09d3c9f518 100644
--- a/tests/app/Census/CensusColumnSexMTest.php
+++ b/tests/app/Census/CensusColumnSexMTest.php
@@ -21,19 +21,12 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSexM
- *
- * X is the value expected for Male, as only the M or F column is expected
- * to be marked.
- */
+#[CoversClass(CensusColumnSexM::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSexMTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexM
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -46,10 +39,6 @@ class CensusColumnSexMTest extends TestCase
         self::assertSame('X', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexM
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFeale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -62,10 +51,6 @@ class CensusColumnSexMTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexM
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php
index 9efb81010e..fd9e23d476 100644
--- a/tests/app/Census/CensusColumnSexMZTest.php
+++ b/tests/app/Census/CensusColumnSexMZTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSexMZ
- */
+
+#[CoversClass(CensusColumnSexMZ::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSexMZTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMZ
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -43,10 +40,6 @@ class CensusColumnSexMZTest extends TestCase
         self::assertSame('M', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMZ
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testFeale(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -59,10 +52,6 @@ class CensusColumnSexMZTest extends TestCase
         self::assertSame('Ž', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMZ
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUnknownSex(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index 9a6448b58e..3f74a3e1f6 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSurnameGivenNameInitial
- */
+
+#[CoversClass(CensusColumnSurnameGivenNameInitial::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSurnameGivenNameInitialTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testOneGivenName(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -51,10 +48,6 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
         self::assertSame('Sixpack, Joe', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMultipleGivenNames(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
index e433db24d8..60d3c1580a 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
@@ -22,16 +22,13 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSurnameGivenNames
- */
+
+#[CoversClass(CensusColumnSurnameGivenNames::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSurnameGivenNamesTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testOneGivenName(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -51,10 +48,6 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         self::assertSame('Sixpack, Joe', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMultipleGivenNames(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -74,10 +67,6 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         self::assertSame('Sixpack, Joe Fred', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoName(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php
index f826eb1a4e..7b9df3202e 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -21,16 +21,13 @@ namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnSurname
- */
+
+#[CoversClass(CensusColumnSurname::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnSurnameTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurname
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testSurname(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -43,10 +40,6 @@ class CensusColumnSurnameTest extends TestCase
         self::assertSame('Bloggs', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnSurname
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoName(): void
     {
         $individual = $this->createMock(Individual::class);
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index e09b20ba94..e2a62f4e53 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -25,16 +25,13 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusColumnYearsMarried
- */
+
+#[CoversClass(CensusColumnYearsMarried::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusColumnYearsMarriedTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnYearsMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoSpouseFamily(): void
     {
         $individual = $this->createMock(Individual::class);
@@ -48,10 +45,6 @@ class CensusColumnYearsMarriedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnYearsMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testNoMarriage(): void
     {
         $family = $this->createMock(Family::class);
@@ -68,10 +61,6 @@ class CensusColumnYearsMarriedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnYearsMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testUndatedMarriage(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -91,10 +80,6 @@ class CensusColumnYearsMarriedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnYearsMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriageAfterCensus(): void
     {
         $fact = $this->createMock(Fact::class);
@@ -114,10 +99,6 @@ class CensusColumnYearsMarriedTest extends TestCase
         self::assertSame('', $column->generate($individual, $individual));
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnYearsMarried
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-     */
     public function testMarriageBeforeCensus(): void
     {
         $fact = $this->createMock(Fact::class);
diff --git a/tests/app/Census/CensusOfCanada1851Test.php b/tests/app/Census/CensusOfCanada1851Test.php
index d5ff224716..450e2b24eb 100644
--- a/tests/app/Census/CensusOfCanada1851Test.php
+++ b/tests/app/Census/CensusOfCanada1851Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1851
- */
+
+#[CoversClass(CensusOfCanada1851::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1851Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1851
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1851Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1851
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1861Test.php b/tests/app/Census/CensusOfCanada1861Test.php
index d19442ee27..12f9cdbbbd 100644
--- a/tests/app/Census/CensusOfCanada1861Test.php
+++ b/tests/app/Census/CensusOfCanada1861Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1861
- */
+
+#[CoversClass(CensusOfCanada1861::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1861Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1861
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1861Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1861
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1871Test.php b/tests/app/Census/CensusOfCanada1871Test.php
index 1627364363..e825f51dcb 100644
--- a/tests/app/Census/CensusOfCanada1871Test.php
+++ b/tests/app/Census/CensusOfCanada1871Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1871
- */
+
+#[CoversClass(CensusOfCanada1871::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1871Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1871
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1871Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1871
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1881Test.php b/tests/app/Census/CensusOfCanada1881Test.php
index 5da66a635a..38eb4f6abe 100644
--- a/tests/app/Census/CensusOfCanada1881Test.php
+++ b/tests/app/Census/CensusOfCanada1881Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1881
- */
+
+#[CoversClass(CensusOfCanada1881::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1881Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1881
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1881Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1881
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1891Test.php b/tests/app/Census/CensusOfCanada1891Test.php
index a5a6983777..91795f0f4d 100644
--- a/tests/app/Census/CensusOfCanada1891Test.php
+++ b/tests/app/Census/CensusOfCanada1891Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1891
- */
+
+#[CoversClass(CensusOfCanada1891::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1891Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1891
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1891Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1891
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1901Test.php b/tests/app/Census/CensusOfCanada1901Test.php
index 2bc5de9184..cc46b7b9bc 100644
--- a/tests/app/Census/CensusOfCanada1901Test.php
+++ b/tests/app/Census/CensusOfCanada1901Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1901
- */
+
+#[CoversClass(CensusOfCanada1901::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1901Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1901
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1901Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1901
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1911Test.php b/tests/app/Census/CensusOfCanada1911Test.php
index cdbca10b38..de1b944d36 100644
--- a/tests/app/Census/CensusOfCanada1911Test.php
+++ b/tests/app/Census/CensusOfCanada1911Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1911
- */
+
+#[CoversClass(CensusOfCanada1911::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1911Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1911
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1911Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1911
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1921Test.php b/tests/app/Census/CensusOfCanada1921Test.php
index 19a4801590..c6b2504723 100644
--- a/tests/app/Census/CensusOfCanada1921Test.php
+++ b/tests/app/Census/CensusOfCanada1921Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1921
- */
+
+#[CoversClass(CensusOfCanada1921::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1921Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1921
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1921Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1921
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanada1931Test.php b/tests/app/Census/CensusOfCanada1931Test.php
index 4aaca439a6..aeb1b5c033 100644
--- a/tests/app/Census/CensusOfCanada1931Test.php
+++ b/tests/app/Census/CensusOfCanada1931Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada1931
- */
+
+#[CoversClass(CensusOfCanada1931::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanada1931Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1931
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanada1931Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1931
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanadaPraries1916Test.php b/tests/app/Census/CensusOfCanadaPraries1916Test.php
index cce692fc5c..3b1998970e 100644
--- a/tests/app/Census/CensusOfCanadaPraries1916Test.php
+++ b/tests/app/Census/CensusOfCanadaPraries1916Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanadaPraries1916
- */
+
+#[CoversClass(CensusOfCanadaPraries1916::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanadaPraries1916Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanadaPraries1916
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanadaPraries1916Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanadaPraries1916
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanadaPraries1926Test.php b/tests/app/Census/CensusOfCanadaPraries1926Test.php
index 63fb65d7f2..4079ecdbbf 100644
--- a/tests/app/Census/CensusOfCanadaPraries1926Test.php
+++ b/tests/app/Census/CensusOfCanadaPraries1926Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanadaPraries1926
- */
+
+#[CoversClass(CensusOfCanadaPraries1926::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCanadaPraries1926Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanadaPraries1926
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCanadaPraries1926Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanadaPraries1926
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCanadaTest.php b/tests/app/Census/CensusOfCanadaTest.php
index 61d6b6b555..4d810c22da 100644
--- a/tests/app/Census/CensusOfCanadaTest.php
+++ b/tests/app/Census/CensusOfCanadaTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCanada
- */
+
+#[CoversClass(CensusOfCanada::class)]
 class CensusOfCanadaTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfCanadaTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfCanadaTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfCzechRepublic1880Test.php b/tests/app/Census/CensusOfCzechRepublic1880Test.php
index 789eeb6cc7..8d07d46f26 100644
--- a/tests/app/Census/CensusOfCzechRepublic1880Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1880Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCzechRepublic1880
- */
+
+#[CoversClass(CensusOfCzechRepublic1880::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCzechRepublic1880Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1880
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCzechRepublic1880Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1880
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCzechRepublic1890Test.php b/tests/app/Census/CensusOfCzechRepublic1890Test.php
index aed073fd3d..65d8d7f0fe 100644
--- a/tests/app/Census/CensusOfCzechRepublic1890Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1890Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCzechRepublic1890
- */
+
+#[CoversClass(CensusOfCzechRepublic1890::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCzechRepublic1890Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1890
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCzechRepublic1890Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1890
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCzechRepublic1900Test.php b/tests/app/Census/CensusOfCzechRepublic1900Test.php
index b1df971625..0d1484bf60 100644
--- a/tests/app/Census/CensusOfCzechRepublic1900Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1900Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCzechRepublic1900
- */
+
+#[CoversClass(CensusOfCzechRepublic1900::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCzechRepublic1900Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1900
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCzechRepublic1900Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1900
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCzechRepublic1910Test.php b/tests/app/Census/CensusOfCzechRepublic1910Test.php
index 5f2a8a8c9c..fd14db0792 100644
--- a/tests/app/Census/CensusOfCzechRepublic1910Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1910Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCzechRepublic1910
- */
+
+#[CoversClass(CensusOfCzechRepublic1910::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCzechRepublic1910Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1910
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCzechRepublic1910Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1910
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCzechRepublic1921Test.php b/tests/app/Census/CensusOfCzechRepublic1921Test.php
index b1d8421f88..655ff66a02 100644
--- a/tests/app/Census/CensusOfCzechRepublic1921Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1921Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCzechRepublic1921
- */
+
+#[CoversClass(CensusOfCzechRepublic1921::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfCzechRepublic1921Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1921
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfCzechRepublic1921Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic1921
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfCzechRepublicTest.php b/tests/app/Census/CensusOfCzechRepublicTest.php
index e23f992762..858a71730c 100644
--- a/tests/app/Census/CensusOfCzechRepublicTest.php
+++ b/tests/app/Census/CensusOfCzechRepublicTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfCzechRepublic
- */
+
+#[CoversClass(CensusOfCzechRepublic::class)]
 class CensusOfCzechRepublicTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfCzechRepublicTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfCzechRepublicTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1787Test.php b/tests/app/Census/CensusOfDenmark1787Test.php
index 305102a119..a5f6c1c505 100644
--- a/tests/app/Census/CensusOfDenmark1787Test.php
+++ b/tests/app/Census/CensusOfDenmark1787Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1787
- */
+
+#[CoversClass(CensusOfDenmark1787::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1787Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1787
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1787Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1787
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1801Test.php b/tests/app/Census/CensusOfDenmark1801Test.php
index 0bb0ca793e..384d631c31 100644
--- a/tests/app/Census/CensusOfDenmark1801Test.php
+++ b/tests/app/Census/CensusOfDenmark1801Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1801
- */
+
+#[CoversClass(CensusOfDenmark1801::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1801Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1801
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1801Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1801
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1803Test.php b/tests/app/Census/CensusOfDenmark1803Test.php
index 26e5b407ba..293f843b7c 100644
--- a/tests/app/Census/CensusOfDenmark1803Test.php
+++ b/tests/app/Census/CensusOfDenmark1803Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1803
- */
+
+#[CoversClass(CensusOfDenmark1803::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1803Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1803
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1803Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1803
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1834Test.php b/tests/app/Census/CensusOfDenmark1834Test.php
index 0bfca6df6e..a2f799670b 100644
--- a/tests/app/Census/CensusOfDenmark1834Test.php
+++ b/tests/app/Census/CensusOfDenmark1834Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1834
- */
+
+#[CoversClass(CensusOfDenmark1834::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1834Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1834
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1834Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1834
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1835Test.php b/tests/app/Census/CensusOfDenmark1835Test.php
index bb7442dcb3..1cae64514a 100644
--- a/tests/app/Census/CensusOfDenmark1835Test.php
+++ b/tests/app/Census/CensusOfDenmark1835Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1835
- */
+
+#[CoversClass(CensusOfDenmark1835::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1835Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1835
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1835Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1835
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1840Test.php b/tests/app/Census/CensusOfDenmark1840Test.php
index a72defd7cb..b76e99923a 100644
--- a/tests/app/Census/CensusOfDenmark1840Test.php
+++ b/tests/app/Census/CensusOfDenmark1840Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1840
- */
+
+#[CoversClass(CensusOfDenmark1840::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1840Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1840
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1840Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1840
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1845Test.php b/tests/app/Census/CensusOfDenmark1845Test.php
index 850c2b813f..1a29d08cf3 100644
--- a/tests/app/Census/CensusOfDenmark1845Test.php
+++ b/tests/app/Census/CensusOfDenmark1845Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1845
- */
+
+#[CoversClass(CensusOfDenmark1845::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1845Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1845
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1845Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1845
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1850Test.php b/tests/app/Census/CensusOfDenmark1850Test.php
index 6b446a4ae5..348b8d733b 100644
--- a/tests/app/Census/CensusOfDenmark1850Test.php
+++ b/tests/app/Census/CensusOfDenmark1850Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1850
- */
+
+#[CoversClass(CensusOfDenmark1850::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1850Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1850
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1850Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1850
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1855Test.php b/tests/app/Census/CensusOfDenmark1855Test.php
index b6f82f50c0..549460376d 100644
--- a/tests/app/Census/CensusOfDenmark1855Test.php
+++ b/tests/app/Census/CensusOfDenmark1855Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1855
- */
+
+#[CoversClass(CensusOfDenmark1855::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1855Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1855
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1855Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1855
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1860Test.php b/tests/app/Census/CensusOfDenmark1860Test.php
index 372e7415aa..f32ad47490 100644
--- a/tests/app/Census/CensusOfDenmark1860Test.php
+++ b/tests/app/Census/CensusOfDenmark1860Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1860
- */
+
+#[CoversClass(CensusOfDenmark1860::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1860Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1860
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1860Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1860
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1870Test.php b/tests/app/Census/CensusOfDenmark1870Test.php
index e8c3378c3f..5572554550 100644
--- a/tests/app/Census/CensusOfDenmark1870Test.php
+++ b/tests/app/Census/CensusOfDenmark1870Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1870
- */
+
+#[CoversClass(CensusOfDenmark1870::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1870Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1870
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1870Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1870
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1880Test.php b/tests/app/Census/CensusOfDenmark1880Test.php
index 6bef368256..62ee528adb 100644
--- a/tests/app/Census/CensusOfDenmark1880Test.php
+++ b/tests/app/Census/CensusOfDenmark1880Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1880
- */
+
+#[CoversClass(CensusOfDenmark1880::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1880Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1880
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1880Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1880
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1885Test.php b/tests/app/Census/CensusOfDenmark1885Test.php
index a0c838357e..31c7238b29 100644
--- a/tests/app/Census/CensusOfDenmark1885Test.php
+++ b/tests/app/Census/CensusOfDenmark1885Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1885
- */
+
+#[CoversClass(CensusOfDenmark1885::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1885Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1885
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1885Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1885
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1890Test.php b/tests/app/Census/CensusOfDenmark1890Test.php
index 0113325b0d..f3d9463b75 100644
--- a/tests/app/Census/CensusOfDenmark1890Test.php
+++ b/tests/app/Census/CensusOfDenmark1890Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1890
- */
+
+#[CoversClass(CensusOfDenmark1890::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1890Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1890
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1890Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1890
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1901Test.php b/tests/app/Census/CensusOfDenmark1901Test.php
index 29af9f4c3d..843471b7ae 100644
--- a/tests/app/Census/CensusOfDenmark1901Test.php
+++ b/tests/app/Census/CensusOfDenmark1901Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1901
- */
+
+#[CoversClass(CensusOfDenmark1901::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1901Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1901
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1901Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1901
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1906Test.php b/tests/app/Census/CensusOfDenmark1906Test.php
index de14960915..bb919c8f91 100644
--- a/tests/app/Census/CensusOfDenmark1906Test.php
+++ b/tests/app/Census/CensusOfDenmark1906Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1906
- */
+
+#[CoversClass(CensusOfDenmark1906::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1906Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1906
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1906Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1906
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1911Test.php b/tests/app/Census/CensusOfDenmark1911Test.php
index d396f9c92c..070b99c3c7 100644
--- a/tests/app/Census/CensusOfDenmark1911Test.php
+++ b/tests/app/Census/CensusOfDenmark1911Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1911
- */
+
+#[CoversClass(CensusOfDenmark1911::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1911Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1911
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1911Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1911
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1916Test.php b/tests/app/Census/CensusOfDenmark1916Test.php
index 4c46172ff7..b7027a2564 100644
--- a/tests/app/Census/CensusOfDenmark1916Test.php
+++ b/tests/app/Census/CensusOfDenmark1916Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1916
- */
+
+#[CoversClass(CensusOfDenmark1916::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1916Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1916
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1916Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1916
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php
index 0befa1a3d2..1cbd049512 100644
--- a/tests/app/Census/CensusOfDenmark1921Test.php
+++ b/tests/app/Census/CensusOfDenmark1921Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1921
- */
+
+#[CoversClass(CensusOfDenmark1921::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1921Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1921
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1921Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1921
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1925Test.php b/tests/app/Census/CensusOfDenmark1925Test.php
index 9eb13311b3..6f87cd3de2 100644
--- a/tests/app/Census/CensusOfDenmark1925Test.php
+++ b/tests/app/Census/CensusOfDenmark1925Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1925
- */
+
+#[CoversClass(CensusOfDenmark1925::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1925Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1925
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1925Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1925
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php
index 473f2eb4d8..cf0793b18c 100644
--- a/tests/app/Census/CensusOfDenmark1930Test.php
+++ b/tests/app/Census/CensusOfDenmark1930Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1930
- */
+
+#[CoversClass(CensusOfDenmark1930::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1930Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1930
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1930Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1930
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmark1940Test.php b/tests/app/Census/CensusOfDenmark1940Test.php
index 4c1505828b..b3c92aa407 100644
--- a/tests/app/Census/CensusOfDenmark1940Test.php
+++ b/tests/app/Census/CensusOfDenmark1940Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark1930
- */
+
+#[CoversClass(CensusOfDenmark1940::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDenmark1940Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1940
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDenmark1940Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark1940
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDenmarkTest.php b/tests/app/Census/CensusOfDenmarkTest.php
index 8db4e786cb..46e9ee6644 100644
--- a/tests/app/Census/CensusOfDenmarkTest.php
+++ b/tests/app/Census/CensusOfDenmarkTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDenmark
- */
+
+#[CoversClass(CensusOfDenmark::class)]
 class CensusOfDenmarkTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfDenmarkTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfDenmarkTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfDeutschland1819Test.php b/tests/app/Census/CensusOfDeutschland1819Test.php
index 880bd28539..05b64c52ee 100644
--- a/tests/app/Census/CensusOfDeutschland1819Test.php
+++ b/tests/app/Census/CensusOfDeutschland1819Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDeutschland1819
- */
+
+#[CoversClass(CensusOfDeutschland1819::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDeutschland1819Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1819
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDeutschland1819Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1819
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDeutschland1867Test.php b/tests/app/Census/CensusOfDeutschland1867Test.php
index a5a6a7c241..f03321f53b 100644
--- a/tests/app/Census/CensusOfDeutschland1867Test.php
+++ b/tests/app/Census/CensusOfDeutschland1867Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDeutschland1867
- */
+
+#[CoversClass(CensusOfDeutschland1867::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDeutschland1867Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1867
      */
     public function testPlaceAndDate(): void
     {
@@ -41,10 +40,7 @@ class CensusOfDeutschland1867Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1867
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
-    */
+     */
     public function testColumns(): void
     {
         $census  = new CensusOfDeutschland1867();
diff --git a/tests/app/Census/CensusOfDeutschland1900Test.php b/tests/app/Census/CensusOfDeutschland1900Test.php
index 89260a955f..fc8e107865 100644
--- a/tests/app/Census/CensusOfDeutschland1900Test.php
+++ b/tests/app/Census/CensusOfDeutschland1900Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDeutschland1900
- */
+
+#[CoversClass(CensusOfDeutschland1900::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDeutschland1900Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1900
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDeutschland1900Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1900
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDeutschland1919Test.php b/tests/app/Census/CensusOfDeutschland1919Test.php
index ad84ee99c1..cced3fd5c9 100644
--- a/tests/app/Census/CensusOfDeutschland1919Test.php
+++ b/tests/app/Census/CensusOfDeutschland1919Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDeutschland1919
- */
+
+#[CoversClass(CensusOfDeutschland1919::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDeutschland1919Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1919
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDeutschland1919Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland1919
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDeutschlandNL1867Test.php b/tests/app/Census/CensusOfDeutschlandNL1867Test.php
index bb10a45901..fe09383649 100644
--- a/tests/app/Census/CensusOfDeutschlandNL1867Test.php
+++ b/tests/app/Census/CensusOfDeutschlandNL1867Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDeutschlandNL1867
- */
+
+#[CoversClass(CensusOfDeutschlandNL1867::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfDeutschlandNL1867Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschlandNL1867
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfDeutschlandNL1867Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschlandNL1867
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfDeutschlandTest.php b/tests/app/Census/CensusOfDeutschlandTest.php
index d1bbb4d289..9ca86ec15d 100644
--- a/tests/app/Census/CensusOfDeutschlandTest.php
+++ b/tests/app/Census/CensusOfDeutschlandTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfDeutschland
- */
+
+#[CoversClass(CensusOfDeutschland::class)]
 class CensusOfDeutschlandTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfDeutschlandTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfDeutschlandTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1841Test.php b/tests/app/Census/CensusOfEngland1841Test.php
index ad0d8d381e..1b50a37c02 100644
--- a/tests/app/Census/CensusOfEngland1841Test.php
+++ b/tests/app/Census/CensusOfEngland1841Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1841
- */
+
+#[CoversClass(CensusOfEngland1841::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1841Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1841
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1841Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1841
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1851Test.php b/tests/app/Census/CensusOfEngland1851Test.php
index 0958019111..a6949f15d4 100644
--- a/tests/app/Census/CensusOfEngland1851Test.php
+++ b/tests/app/Census/CensusOfEngland1851Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1851
- */
+
+#[CoversClass(CensusOfEngland1851::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1851Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1851
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1851Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1851
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1861Test.php b/tests/app/Census/CensusOfEngland1861Test.php
index f7ff268f48..7cb69b35a6 100644
--- a/tests/app/Census/CensusOfEngland1861Test.php
+++ b/tests/app/Census/CensusOfEngland1861Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1861
- */
+
+#[CoversClass(CensusOfEngland1861::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1861Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1861
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1861Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1861
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php
index 39c541dee2..54e7c31916 100644
--- a/tests/app/Census/CensusOfEngland1871Test.php
+++ b/tests/app/Census/CensusOfEngland1871Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1871
- */
+
+#[CoversClass(CensusOfEngland1871::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1871Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1871
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1871Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1871
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php
index 89427b5c21..49d0358ebb 100644
--- a/tests/app/Census/CensusOfEngland1881Test.php
+++ b/tests/app/Census/CensusOfEngland1881Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1881
- */
+
+#[CoversClass(CensusOfEngland1881::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1881Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1881
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1881Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1881
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php
index ee3e7d4947..6773874bda 100644
--- a/tests/app/Census/CensusOfEngland1891Test.php
+++ b/tests/app/Census/CensusOfEngland1891Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1891
- */
+
+#[CoversClass(CensusOfEngland1891::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1891Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1891
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1891Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1891
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php
index 42a6eee031..402944f275 100644
--- a/tests/app/Census/CensusOfEngland1901Test.php
+++ b/tests/app/Census/CensusOfEngland1901Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1901
- */
+
+#[CoversClass(CensusOfEngland1901::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1901Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1901
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1901Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1901
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php
index 40316cee30..c6ccd05fd9 100644
--- a/tests/app/Census/CensusOfEngland1911Test.php
+++ b/tests/app/Census/CensusOfEngland1911Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland1911
- */
+
+#[CoversClass(CensusOfEngland1911::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfEngland1911Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1911
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfEngland1911Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland1911
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfEnglandTest.php b/tests/app/Census/CensusOfEnglandTest.php
index b898c4892f..f7ea7dab7b 100644
--- a/tests/app/Census/CensusOfEnglandTest.php
+++ b/tests/app/Census/CensusOfEnglandTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfEngland
- */
+
+#[CoversClass(CensusOfEngland::class)]
 class CensusOfEnglandTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfEnglandTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfEnglandTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1831Test.php b/tests/app/Census/CensusOfFrance1831Test.php
index 417bd70edb..af14c15fd8 100644
--- a/tests/app/Census/CensusOfFrance1831Test.php
+++ b/tests/app/Census/CensusOfFrance1831Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1836
- */
+
+#[CoversClass(CensusOfFrance1831::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1831Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1831
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1831Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1831
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1836Test.php b/tests/app/Census/CensusOfFrance1836Test.php
index 019b3860cf..d4c8668314 100644
--- a/tests/app/Census/CensusOfFrance1836Test.php
+++ b/tests/app/Census/CensusOfFrance1836Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1836
- */
+
+#[CoversClass(CensusOfFrance1836::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1836Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1836
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1836Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1836
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1841Test.php b/tests/app/Census/CensusOfFrance1841Test.php
index ffe392bd45..f554b80716 100644
--- a/tests/app/Census/CensusOfFrance1841Test.php
+++ b/tests/app/Census/CensusOfFrance1841Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1841
- */
+
+#[CoversClass(CensusOfFrance1841::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1841Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1841
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1841Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1841
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1846Test.php b/tests/app/Census/CensusOfFrance1846Test.php
index 679b0aea91..ac45a9b429 100644
--- a/tests/app/Census/CensusOfFrance1846Test.php
+++ b/tests/app/Census/CensusOfFrance1846Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1846
- */
+
+#[CoversClass(CensusOfFrance1846::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1846Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1846
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1846Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1846
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1851Test.php b/tests/app/Census/CensusOfFrance1851Test.php
index aa84c2295e..d70ee946ec 100644
--- a/tests/app/Census/CensusOfFrance1851Test.php
+++ b/tests/app/Census/CensusOfFrance1851Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1851
- */
+
+#[CoversClass(CensusOfFrance1851::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1851Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1851
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1851Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1851
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1856Test.php b/tests/app/Census/CensusOfFrance1856Test.php
index b260eea86d..f7d6daf39b 100644
--- a/tests/app/Census/CensusOfFrance1856Test.php
+++ b/tests/app/Census/CensusOfFrance1856Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1856
- */
+
+#[CoversClass(CensusOfFrance1856::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1856Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1856
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1856Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1856
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1861Test.php b/tests/app/Census/CensusOfFrance1861Test.php
index e03f7e0b71..4c8212f165 100644
--- a/tests/app/Census/CensusOfFrance1861Test.php
+++ b/tests/app/Census/CensusOfFrance1861Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1861
- */
+
+#[CoversClass(CensusOfFrance1861::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1861Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1861
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1861Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1861
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1866Test.php b/tests/app/Census/CensusOfFrance1866Test.php
index 8a1f9d353a..b6b1f937c8 100644
--- a/tests/app/Census/CensusOfFrance1866Test.php
+++ b/tests/app/Census/CensusOfFrance1866Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1866
- */
+
+#[CoversClass(CensusOfFrance1866::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1866Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1866
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1866Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1866
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1872Test.php b/tests/app/Census/CensusOfFrance1872Test.php
index 58d714b3b8..6298032e71 100644
--- a/tests/app/Census/CensusOfFrance1872Test.php
+++ b/tests/app/Census/CensusOfFrance1872Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1872
- */
+
+#[CoversClass(CensusOfFrance1872::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1872Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1872
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1872Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1872
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1876Test.php b/tests/app/Census/CensusOfFrance1876Test.php
index 13e998a754..8690cdbc37 100644
--- a/tests/app/Census/CensusOfFrance1876Test.php
+++ b/tests/app/Census/CensusOfFrance1876Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1876
- */
+
+#[CoversClass(CensusOfFrance1876::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1876Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1876
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1876Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1876
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1881Test.php b/tests/app/Census/CensusOfFrance1881Test.php
index e756e47c0b..c9bdf75c8f 100644
--- a/tests/app/Census/CensusOfFrance1881Test.php
+++ b/tests/app/Census/CensusOfFrance1881Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1881
- */
+
+#[CoversClass(CensusOfFrance1881::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1881Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1881
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1881Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1881
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1886Test.php b/tests/app/Census/CensusOfFrance1886Test.php
index 71c61e4550..33454e5f45 100644
--- a/tests/app/Census/CensusOfFrance1886Test.php
+++ b/tests/app/Census/CensusOfFrance1886Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1886
- */
+
+#[CoversClass(CensusOfFrance1886::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1886Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1886
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1886Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1886
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1891Test.php b/tests/app/Census/CensusOfFrance1891Test.php
index 31ed791465..c1086c31e2 100644
--- a/tests/app/Census/CensusOfFrance1891Test.php
+++ b/tests/app/Census/CensusOfFrance1891Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1891
- */
+
+#[CoversClass(CensusOfFrance1891::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1891Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1891
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1891Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1891
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1896Test.php b/tests/app/Census/CensusOfFrance1896Test.php
index 060e28375b..430575bfbc 100644
--- a/tests/app/Census/CensusOfFrance1896Test.php
+++ b/tests/app/Census/CensusOfFrance1896Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1896
- */
+
+#[CoversClass(CensusOfFrance1896::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1896Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1896
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1896Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1896
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1901Test.php b/tests/app/Census/CensusOfFrance1901Test.php
index 6d5c24b2e9..b5845890df 100644
--- a/tests/app/Census/CensusOfFrance1901Test.php
+++ b/tests/app/Census/CensusOfFrance1901Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1901
- */
+
+#[CoversClass(CensusOfFrance1901::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1901Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1901
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1901Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1901
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1906Test.php b/tests/app/Census/CensusOfFrance1906Test.php
index 0b2b2b31c2..4cf68148c1 100644
--- a/tests/app/Census/CensusOfFrance1906Test.php
+++ b/tests/app/Census/CensusOfFrance1906Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1906
- */
+
+#[CoversClass(CensusOfFrance1906::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1906Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1906
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1906Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1906
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1911Test.php b/tests/app/Census/CensusOfFrance1911Test.php
index 89524e1a62..7d89782214 100644
--- a/tests/app/Census/CensusOfFrance1911Test.php
+++ b/tests/app/Census/CensusOfFrance1911Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1911
- */
+
+#[CoversClass(CensusOfFrance1911::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1911Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1911
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1911Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1911
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1921Test.php b/tests/app/Census/CensusOfFrance1921Test.php
index 366271df6d..36446a32de 100644
--- a/tests/app/Census/CensusOfFrance1921Test.php
+++ b/tests/app/Census/CensusOfFrance1921Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1921
- */
+
+#[CoversClass(CensusOfFrance1921::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1921Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1921
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1921Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1921
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1926Test.php b/tests/app/Census/CensusOfFrance1926Test.php
index b3c66dc25f..1914576ce7 100644
--- a/tests/app/Census/CensusOfFrance1926Test.php
+++ b/tests/app/Census/CensusOfFrance1926Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1926
- */
+
+#[CoversClass(CensusOfFrance1926::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1926Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1926
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1926Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1926
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1931Test.php b/tests/app/Census/CensusOfFrance1931Test.php
index fbc8eec88d..3b1b13f9b5 100644
--- a/tests/app/Census/CensusOfFrance1931Test.php
+++ b/tests/app/Census/CensusOfFrance1931Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1931
- */
+
+#[CoversClass(CensusOfFrance1931::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1931Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1931
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1931Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1931
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1936Test.php b/tests/app/Census/CensusOfFrance1936Test.php
index 9543ca3a24..4a0897aa3c 100644
--- a/tests/app/Census/CensusOfFrance1936Test.php
+++ b/tests/app/Census/CensusOfFrance1936Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1936
- */
+
+#[CoversClass(CensusOfFrance1936::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1936Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1936
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1936Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1936
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFrance1946Test.php b/tests/app/Census/CensusOfFrance1946Test.php
index 21c9bedd71..be15f59f36 100644
--- a/tests/app/Census/CensusOfFrance1946Test.php
+++ b/tests/app/Census/CensusOfFrance1946Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance1946
- */
+
+#[CoversClass(CensusOfFrance1946::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfFrance1946Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1946
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfFrance1946Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance1946
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfFranceTest.php b/tests/app/Census/CensusOfFranceTest.php
index 2e12c1ab06..d11dcaab10 100644
--- a/tests/app/Census/CensusOfFranceTest.php
+++ b/tests/app/Census/CensusOfFranceTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfFrance
- */
+
+#[CoversClass(CensusOfFrance::class)]
 class CensusOfFranceTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfFranceTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfFranceTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfRhodeIsland1905Test.php b/tests/app/Census/CensusOfRhodeIsland1905Test.php
index 5d2a1d3a4c..7eabf1106b 100644
--- a/tests/app/Census/CensusOfRhodeIsland1905Test.php
+++ b/tests/app/Census/CensusOfRhodeIsland1905Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfRhodeIsland1905
- */
+
+#[CoversClass(CensusOfRhodeIsland1905::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfRhodeIsland1905Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland1905
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfRhodeIsland1905Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland1905
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfRhodeIsland1915Test.php b/tests/app/Census/CensusOfRhodeIsland1915Test.php
index 158a19a554..7c29a9a7e6 100644
--- a/tests/app/Census/CensusOfRhodeIsland1915Test.php
+++ b/tests/app/Census/CensusOfRhodeIsland1915Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfRhodeIsland1915
- */
+
+#[CoversClass(CensusOfRhodeIsland1915::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfRhodeIsland1915Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland1915
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfRhodeIsland1915Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland1915
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfRhodeIsland1925Test.php b/tests/app/Census/CensusOfRhodeIsland1925Test.php
index 5b875f36c1..c6e9f9445b 100644
--- a/tests/app/Census/CensusOfRhodeIsland1925Test.php
+++ b/tests/app/Census/CensusOfRhodeIsland1925Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfRhodeIsland1915
- */
+
+#[CoversClass(CensusOfRhodeIsland1925::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfRhodeIsland1925Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland1925
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfRhodeIsland1925Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland1925
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfRhodeIslandTest.php b/tests/app/Census/CensusOfRhodeIslandTest.php
index 9106f476e6..bb795026f7 100644
--- a/tests/app/Census/CensusOfRhodeIslandTest.php
+++ b/tests/app/Census/CensusOfRhodeIslandTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfRhodeIsland
- */
+
+#[CoversClass(CensusOfRhodeIsland::class)]
 class CensusOfRhodeIslandTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfRhodeIslandTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfRhodeIslandTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfRhodeIsland
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1841Test.php b/tests/app/Census/CensusOfScotland1841Test.php
index 10be0e9646..8779c27600 100644
--- a/tests/app/Census/CensusOfScotland1841Test.php
+++ b/tests/app/Census/CensusOfScotland1841Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1841
- */
+
+#[CoversClass(CensusOfScotland1841::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1841Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1841
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1841Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1841
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1851Test.php b/tests/app/Census/CensusOfScotland1851Test.php
index a4bdbc55f1..354be16a65 100644
--- a/tests/app/Census/CensusOfScotland1851Test.php
+++ b/tests/app/Census/CensusOfScotland1851Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1851
- */
+
+#[CoversClass(CensusOfScotland1851::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1851Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1851
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1851Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1851
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php
index b32c6e46f4..461e29ea17 100644
--- a/tests/app/Census/CensusOfScotland1861Test.php
+++ b/tests/app/Census/CensusOfScotland1861Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1861
- */
+
+#[CoversClass(CensusOfScotland1861::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1861Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1861
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1861Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1861
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php
index 33dafae1e7..a600702cc9 100644
--- a/tests/app/Census/CensusOfScotland1871Test.php
+++ b/tests/app/Census/CensusOfScotland1871Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1871
- */
+
+#[CoversClass(CensusOfScotland1871::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1871Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1871
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1871Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1871
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php
index 53d1d88811..876f3ba276 100644
--- a/tests/app/Census/CensusOfScotland1881Test.php
+++ b/tests/app/Census/CensusOfScotland1881Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1881
- */
+
+#[CoversClass(CensusOfScotland1881::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1881Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1881
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1881Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1881
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php
index ed15d8c505..60b9873fa7 100644
--- a/tests/app/Census/CensusOfScotland1891Test.php
+++ b/tests/app/Census/CensusOfScotland1891Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1891
- */
+
+#[CoversClass(CensusOfScotland1891::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1891Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1891
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1891Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1891
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php
index cddd4e9119..76a10959de 100644
--- a/tests/app/Census/CensusOfScotland1901Test.php
+++ b/tests/app/Census/CensusOfScotland1901Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1901
- */
+
+#[CoversClass(CensusOfScotland1901::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1901Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1901
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1901Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1901
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php
index 78b044ecec..b7d4a98e2d 100644
--- a/tests/app/Census/CensusOfScotland1911Test.php
+++ b/tests/app/Census/CensusOfScotland1911Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland1911
- */
+
+#[CoversClass(CensusOfScotland1911::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfScotland1911Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1911
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfScotland1911Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland1911
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfScotlandTest.php b/tests/app/Census/CensusOfScotlandTest.php
index 9140e21c25..a2e1e58140 100644
--- a/tests/app/Census/CensusOfScotlandTest.php
+++ b/tests/app/Census/CensusOfScotlandTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfScotland
- */
+
+#[CoversClass(CensusOfScotland::class)]
 class CensusOfScotlandTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfScotlandTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfScotlandTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfSlovakia1869Test.php b/tests/app/Census/CensusOfSlovakia1869Test.php
index bcab87f4d6..bfdffaf4bd 100644
--- a/tests/app/Census/CensusOfSlovakia1869Test.php
+++ b/tests/app/Census/CensusOfSlovakia1869Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfSlovakia1869
- */
+
+#[CoversClass(CensusOfSlovakia1869::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfSlovakia1869Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia1869
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfSlovakia1869Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia1869
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfSlovakia1930Test.php b/tests/app/Census/CensusOfSlovakia1930Test.php
index 142b07f4f6..289fc63275 100644
--- a/tests/app/Census/CensusOfSlovakia1930Test.php
+++ b/tests/app/Census/CensusOfSlovakia1930Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfSlovakia1930
- */
+
+#[CoversClass(CensusOfSlovakia1930::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfSlovakia1930Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia1930
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfSlovakia1930Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia1930
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfSlovakia1940Test.php b/tests/app/Census/CensusOfSlovakia1940Test.php
index b625fb68fa..f37445649d 100644
--- a/tests/app/Census/CensusOfSlovakia1940Test.php
+++ b/tests/app/Census/CensusOfSlovakia1940Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfSlovakia1940
- */
+
+#[CoversClass(CensusOfSlovakia1940::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfSlovakia1940Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia1940
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfSlovakia1940Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia1940
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfSlovakiaTest.php b/tests/app/Census/CensusOfSlovakiaTest.php
index ef3602427b..e0b6cfad48 100644
--- a/tests/app/Census/CensusOfSlovakiaTest.php
+++ b/tests/app/Census/CensusOfSlovakiaTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfSlovakia
- */
+
+#[CoversClass(CensusOfSlovakia::class)]
 class CensusOfSlovakiaTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfSlovakiaTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfSlovakiaTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1790Test.php b/tests/app/Census/CensusOfUnitedStates1790Test.php
index 00f426f8a5..1c07a7c977 100644
--- a/tests/app/Census/CensusOfUnitedStates1790Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1790Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1790
- */
+
+#[CoversClass(CensusOfUnitedStates1790::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1790Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1790
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1790Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1790
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1800Test.php b/tests/app/Census/CensusOfUnitedStates1800Test.php
index 1ffa2d97f9..55e399e316 100644
--- a/tests/app/Census/CensusOfUnitedStates1800Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1800Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1800
- */
+
+#[CoversClass(CensusOfUnitedStates1800::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1800Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1800
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1800Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1800
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1810Test.php b/tests/app/Census/CensusOfUnitedStates1810Test.php
index 1ccd647b34..a556fe5d3d 100644
--- a/tests/app/Census/CensusOfUnitedStates1810Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1810Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1810
- */
+
+#[CoversClass(CensusOfUnitedStates1810::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1810Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1810
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1810Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1810
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1820Test.php b/tests/app/Census/CensusOfUnitedStates1820Test.php
index c09e5c7114..0dc3df907f 100644
--- a/tests/app/Census/CensusOfUnitedStates1820Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1820Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1820
- */
+
+#[CoversClass(CensusOfUnitedStates1820::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1820Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1820
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1820Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1820
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1830Test.php b/tests/app/Census/CensusOfUnitedStates1830Test.php
index 77b82bdd25..ad02752465 100644
--- a/tests/app/Census/CensusOfUnitedStates1830Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1830Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1830
- */
+
+#[CoversClass(CensusOfUnitedStates1830::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1830Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1830
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1830Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1830
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1840Test.php b/tests/app/Census/CensusOfUnitedStates1840Test.php
index 615330b6b7..f8fdedcfab 100644
--- a/tests/app/Census/CensusOfUnitedStates1840Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1840Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1840
- */
+
+#[CoversClass(CensusOfUnitedStates1840::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1840Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1840
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1840Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1840
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1850Test.php b/tests/app/Census/CensusOfUnitedStates1850Test.php
index 6369de7179..12c3387279 100644
--- a/tests/app/Census/CensusOfUnitedStates1850Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1850Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1850
- */
+
+#[CoversClass(CensusOfUnitedStates1850::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1850Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1850
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1850Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1850
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1860Test.php b/tests/app/Census/CensusOfUnitedStates1860Test.php
index c2b6db5784..750e8eebc9 100644
--- a/tests/app/Census/CensusOfUnitedStates1860Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1860Test.php
@@ -20,17 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1860
- */
+
+#[CoversClass(CensusOfUnitedStates1860::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1860Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1860
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testPlaceAndDate(): void
     {
@@ -42,8 +40,6 @@ class CensusOfUnitedStates1860Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1860
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1870Test.php b/tests/app/Census/CensusOfUnitedStates1870Test.php
index 616b508cf4..9cb395aa9c 100644
--- a/tests/app/Census/CensusOfUnitedStates1870Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1870Test.php
@@ -20,17 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1870
- */
+
+#[CoversClass(CensusOfUnitedStates1870::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1870Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1870
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testPlaceAndDate(): void
     {
@@ -42,8 +40,6 @@ class CensusOfUnitedStates1870Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1870
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1880Test.php b/tests/app/Census/CensusOfUnitedStates1880Test.php
index f9addbd29e..91c345b4a0 100644
--- a/tests/app/Census/CensusOfUnitedStates1880Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1880Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1880
- */
+
+#[CoversClass(CensusOfUnitedStates1880::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1880Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1880
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1880Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1880
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1890Test.php b/tests/app/Census/CensusOfUnitedStates1890Test.php
index 417c98f72a..310df54a92 100644
--- a/tests/app/Census/CensusOfUnitedStates1890Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1890Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1890
- */
+
+#[CoversClass(CensusOfUnitedStates1890::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1890Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1890
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1890Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1890
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1900Test.php b/tests/app/Census/CensusOfUnitedStates1900Test.php
index 0f803fa795..5ecf2fdbf2 100644
--- a/tests/app/Census/CensusOfUnitedStates1900Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1900Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1900
- */
+
+#[CoversClass(CensusOfUnitedStates1900::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1900Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1900
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1900Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1900
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1910Test.php b/tests/app/Census/CensusOfUnitedStates1910Test.php
index 72f15f3232..59176fa50e 100644
--- a/tests/app/Census/CensusOfUnitedStates1910Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1910Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1910
- */
+
+#[CoversClass(CensusOfUnitedStates1910::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1910Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1910
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1910Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1910
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1920Test.php b/tests/app/Census/CensusOfUnitedStates1920Test.php
index 4f6657cdff..fcfac83631 100644
--- a/tests/app/Census/CensusOfUnitedStates1920Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1920Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1920
- */
+
+#[CoversClass(CensusOfUnitedStates1920::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1920Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1920
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1920Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1920
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1930Test.php b/tests/app/Census/CensusOfUnitedStates1930Test.php
index a86c158e95..0989ee14e8 100644
--- a/tests/app/Census/CensusOfUnitedStates1930Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1930Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1930
- */
+
+#[CoversClass(CensusOfUnitedStates1930::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1930Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1930
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1930Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1930
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1940Test.php b/tests/app/Census/CensusOfUnitedStates1940Test.php
index 638d1c76f3..8e0ceb006b 100644
--- a/tests/app/Census/CensusOfUnitedStates1940Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1940Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1940
- */
+
+#[CoversClass(CensusOfUnitedStates1940::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1940Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1940
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfUnitedStates1940Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1940
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStates1950Test.php b/tests/app/Census/CensusOfUnitedStates1950Test.php
index cd4623ce60..2d19d9704d 100644
--- a/tests/app/Census/CensusOfUnitedStates1950Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1950Test.php
@@ -20,17 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates1950
- */
 
+#[CoversClass(CensusOfUnitedStates1950::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfUnitedStates1950Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1950
      */
     public function testPlaceAndDate(): void
     {
@@ -42,9 +40,6 @@ class CensusOfUnitedStates1950Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates1950
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfUnitedStatesTest.php b/tests/app/Census/CensusOfUnitedStatesTest.php
index 279e8e9736..a462afc5a6 100644
--- a/tests/app/Census/CensusOfUnitedStatesTest.php
+++ b/tests/app/Census/CensusOfUnitedStatesTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfUnitedStates
- */
+
+#[CoversClass(CensusOfUnitedStates::class)]
 class CensusOfUnitedStatesTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfUnitedStatesTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfUnitedStatesTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusOfWales1841Test.php b/tests/app/Census/CensusOfWales1841Test.php
index 1657a9f9ab..b057548ad9 100644
--- a/tests/app/Census/CensusOfWales1841Test.php
+++ b/tests/app/Census/CensusOfWales1841Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1841
- */
+
+#[CoversClass(CensusOfWales1841::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1841Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1841
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1841Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1841
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1851Test.php b/tests/app/Census/CensusOfWales1851Test.php
index f40f252704..888e264875 100644
--- a/tests/app/Census/CensusOfWales1851Test.php
+++ b/tests/app/Census/CensusOfWales1851Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1851
- */
+
+#[CoversClass(CensusOfWales1851::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1851Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1851
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1851Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1851
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1861Test.php b/tests/app/Census/CensusOfWales1861Test.php
index fd362414d4..ee91101b42 100644
--- a/tests/app/Census/CensusOfWales1861Test.php
+++ b/tests/app/Census/CensusOfWales1861Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1861
- */
+
+#[CoversClass(CensusOfWales1861::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1861Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1861
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1861Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1861
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php
index cb55bcd3ca..7e3e277420 100644
--- a/tests/app/Census/CensusOfWales1871Test.php
+++ b/tests/app/Census/CensusOfWales1871Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1871
- */
+
+#[CoversClass(CensusOfWales1871::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1871Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1871
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1871Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1871
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php
index d25ddd9dfe..4e09b5ca25 100644
--- a/tests/app/Census/CensusOfWales1881Test.php
+++ b/tests/app/Census/CensusOfWales1881Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1881
- */
+
+#[CoversClass(CensusOfWales1881::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1881Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1881
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1881Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1881
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php
index f1ee2a2581..761f6bba9e 100644
--- a/tests/app/Census/CensusOfWales1891Test.php
+++ b/tests/app/Census/CensusOfWales1891Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1891
- */
+
+#[CoversClass(CensusOfWales1891::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1891Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1891
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1891Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1891
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php
index a2037395f5..5aa67d69dd 100644
--- a/tests/app/Census/CensusOfWales1901Test.php
+++ b/tests/app/Census/CensusOfWales1901Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1901
- */
+
+#[CoversClass(CensusOfWales1901::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1901Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1901
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1901Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1901
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php
index 5c67a4d3da..e3f02617be 100644
--- a/tests/app/Census/CensusOfWales1911Test.php
+++ b/tests/app/Census/CensusOfWales1911Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales1911
- */
+
+#[CoversClass(CensusOfWales1911::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class CensusOfWales1911Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1911
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class CensusOfWales1911Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales1911
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/CensusOfWalesTest.php b/tests/app/Census/CensusOfWalesTest.php
index 05571979f5..e7e7b021f0 100644
--- a/tests/app/Census/CensusOfWalesTest.php
+++ b/tests/app/Census/CensusOfWalesTest.php
@@ -20,16 +20,14 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class CensusOfWales
- */
+
+#[CoversClass(CensusOfWales::class)]
 class CensusOfWalesTest extends TestCase
 {
     /**
      * Test the census place
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales
      */
     public function testPlace(): void
     {
@@ -40,8 +38,6 @@ class CensusOfWalesTest extends TestCase
 
     /**
      * Test the census language
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales
      */
     public function testLanguage(): void
     {
@@ -52,8 +48,6 @@ class CensusOfWalesTest extends TestCase
 
     /**
      * Test the census dates
-     *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfWales
      */
     public function testAllDates(): void
     {
diff --git a/tests/app/Census/CensusTest.php b/tests/app/Census/CensusTest.php
index 4d9fa022c8..0b17889528 100644
--- a/tests/app/Census/CensusTest.php
+++ b/tests/app/Census/CensusTest.php
@@ -20,15 +20,12 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class Census
- */
+
+#[CoversClass(Census::class)]
 class CensusTest extends TestCase
 {
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesCzech(): void
     {
         $censuses = Census::censusPlaces('cs');
@@ -47,9 +44,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfCanada::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesDanish(): void
     {
         $censuses = Census::censusPlaces('da');
@@ -68,9 +62,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfCanada::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesGerman(): void
     {
         $censuses = Census::censusPlaces('de');
@@ -89,9 +80,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfCanada::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesAustralianEnglish(): void
     {
         $censuses = Census::censusPlaces('en-AU');
@@ -110,9 +98,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfSlovakia::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesBritishEnglish(): void
     {
         $censuses = Census::censusPlaces('en-GB');
@@ -131,9 +116,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfSlovakia::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesUSEnglish(): void
     {
         $censuses = Census::censusPlaces('en-US');
@@ -152,9 +134,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfWales::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesFrench(): void
     {
         $censuses = Census::censusPlaces('fr');
@@ -173,9 +152,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfWales::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesCanadianFrench(): void
     {
         $censuses = Census::censusPlaces('fr-CA');
@@ -194,9 +170,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfWales::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesSlovak(): void
     {
         $censuses = Census::censusPlaces('sk');
@@ -215,9 +188,6 @@ class CensusTest extends TestCase
         self::assertInstanceOf(CensusOfCanada::class, $censuses[10]);
     }
 
-    /**
-     * @covers \Fisharebest\Webtrees\Census\Census
-     */
     public function testCensusPlacesDefault(): void
     {
         $censuses = Census::censusPlaces('XX');
diff --git a/tests/app/Census/RegisterOfEngland1939Test.php b/tests/app/Census/RegisterOfEngland1939Test.php
index b8c1dc7cf9..fd349d5c20 100644
--- a/tests/app/Census/RegisterOfEngland1939Test.php
+++ b/tests/app/Census/RegisterOfEngland1939Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class RegisterOfEngland1939
- */
+
+#[CoversClass(RegisterOfEngland1939::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class RegisterOfEngland1939Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\RegisterOfEngland1939
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class RegisterOfEngland1939Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\RegisterOfEngland1939
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/RegisterOfScotland1939Test.php b/tests/app/Census/RegisterOfScotland1939Test.php
index 9527aba360..b31939396c 100644
--- a/tests/app/Census/RegisterOfScotland1939Test.php
+++ b/tests/app/Census/RegisterOfScotland1939Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class RegisterOfScotland1939
- */
+
+#[CoversClass(RegisterOfScotland1939::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class RegisterOfScotland1939Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\RegisterOfScotland1939
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class RegisterOfScotland1939Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\RegisterOfScotland1939
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {
diff --git a/tests/app/Census/RegisterOfWales1939Test.php b/tests/app/Census/RegisterOfWales1939Test.php
index 4f36e9287d..b99c0bc4db 100644
--- a/tests/app/Census/RegisterOfWales1939Test.php
+++ b/tests/app/Census/RegisterOfWales1939Test.php
@@ -20,16 +20,15 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * Test harness for the class RegisterOfWales1939
- */
+
+#[CoversClass(RegisterOfWales1939::class)]
+#[CoversClass(AbstractCensusColumn::class)]
 class RegisterOfWales1939Test extends TestCase
 {
     /**
      * Test the census place and date
-     *
-     * @covers \Fisharebest\Webtrees\Census\RegisterOfWales1939
      */
     public function testPlaceAndDate(): void
     {
@@ -41,9 +40,6 @@ class RegisterOfWales1939Test extends TestCase
 
     /**
      * Test the census columns
-     *
-     * @covers \Fisharebest\Webtrees\Census\RegisterOfWales1939
-     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      */
     public function testColumns(): void
     {