Cleanup census classes

3 files changed, 4 insertions, 3 deletions

diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php
index ad776f30ff..35ba751859 100644
--- a/tests/app/Census/CensusColumnSexMZTest.php
+++ b/tests/app/Census/CensusColumnSexMZTest.php
@@ -19,6 +19,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Encodings\UTF8;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -48,7 +49,7 @@ class CensusColumnSexMZTest extends TestCase
 
         $column = new CensusColumnSexMZ($census, '', '');
 
-        self::assertSame('Ž', $column->generate($individual, $individual));
+        self::assertSame(UTF8::LATIN_CAPITAL_LETTER_Z_WITH_CARON, $column->generate($individual, $individual));
     }
 
     public function testUnknownSex(): void
diff --git a/tests/app/Census/CensusOfUnitedStates1850Test.php b/tests/app/Census/CensusOfUnitedStates1850Test.php
index a31686ca3e..e14e2d0562 100644
--- a/tests/app/Census/CensusOfUnitedStates1850Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1850Test.php
@@ -46,7 +46,7 @@ class CensusOfUnitedStates1850Test extends TestCase
         self::assertInstanceOf(CensusColumnNull::class, $columns[3]);
         self::assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[5]);
-        self::assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+        self::assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[6]);
         self::assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[7]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[8]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[9]);
diff --git a/tests/app/Census/CensusOfUnitedStates1860Test.php b/tests/app/Census/CensusOfUnitedStates1860Test.php
index ab268231d6..596b4153f2 100644
--- a/tests/app/Census/CensusOfUnitedStates1860Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1860Test.php
@@ -47,7 +47,7 @@ class CensusOfUnitedStates1860Test extends TestCase
         self::assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[5]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[6]);
-        self::assertInstanceOf(CensusColumnBirthPlace::class, $columns[7]);
+        self::assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[7]);
         self::assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[8]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[9]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[10]);