Use ::class notation for class names

55 files changed, 836 insertions, 729 deletions

diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
index 1131862a05..2799a1f3e5 100644
--- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +44,10 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
@@ -61,11 +62,11 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -81,11 +82,11 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -101,11 +102,11 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testLessThanOneYear()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -121,11 +122,11 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testLessThanFifteenYears()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1814');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -141,11 +142,11 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testRoundedDownToFiveYears()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1844');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php
index ff92ae464a..d48744cca3 100644
--- a/tests/app/Census/CensusColumnAgeFemaleTest.php
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +44,10 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
@@ -61,11 +62,11 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeFemale($census, '', '');
@@ -81,11 +82,11 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeFemale($census, '', '');
@@ -101,11 +102,11 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testLessThanOneYear()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeFemale($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
index aba5f6c26d..e5b4c4983a 100644
--- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,11 +44,11 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -63,10 +64,10 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
@@ -81,11 +82,11 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -101,11 +102,11 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testLessThanOneYear()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -121,11 +122,11 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testLessThanFifteenYears()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1814');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -141,11 +142,11 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testRoundedDownToFiveYears()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1844');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php
index 993d768ebe..b8359cfa62 100644
--- a/tests/app/Census/CensusColumnAgeMaleTest.php
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,11 +44,11 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeMale($census, '', '');
@@ -63,10 +64,10 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnAgeMale($census, '', '');
 
@@ -81,11 +82,11 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeMale($census, '', '');
@@ -101,11 +102,11 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testLessThanOneYear()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeMale($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 3217b4d20e..904e063cef 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,17 +46,17 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testAgeMarried()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840'));
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -69,11 +72,11 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoBirthDate()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date(''));
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -89,14 +92,14 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoMarriage()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date(''));
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -112,11 +115,11 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840'));
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php
index efec7c0169..a89343807a 100644
--- a/tests/app/Census/CensusColumnAgeTest.php
+++ b/tests/app/Census/CensusColumnAgeTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +44,10 @@ class CensusColumnAgeTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnAge($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php
index 846c11abb3..d1525b0a93 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,16 +45,16 @@ class CensusColumnBirthDateTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('1 1 1800');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDate($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
index 5b38693af8..a58239fa0a 100644
--- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,18 +45,18 @@ class CensusColumnBirthDayDotMonthYearTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('30. June 1832');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumJulianDay')->andReturn(2390364);
         $date->shouldReceive('maximumJulianDay')->andReturn(2390364);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDayDotMonthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php
index 61ef9f7334..6fe19cd14c 100644
--- a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,18 +45,18 @@ class CensusColumnBirthDayMonthSlashYearTest extends \Fisharebest\Webtrees\TestC
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('30 Jun/1832');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumJulianDay')->andReturn(2390364);
         $date->shouldReceive('maximumJulianDay')->andReturn(2390364);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDayMonthSlashYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
index 056be1b4cd..ecd134bef8 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,18 +45,18 @@ class CensusColumnBirthDaySlashMonthTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('30/6');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumJulianDay')->andReturn(2390364);
         $date->shouldReceive('maximumJulianDay')->andReturn(2390364);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDaySlashMonth($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
index 2225409c2a..18a47f22ec 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,18 +45,18 @@ class CensusColumnBirthDaySlashMonthYearTest extends \Fisharebest\Webtrees\TestC
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('30/6 1832');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumJulianDay')->andReturn(2390364);
         $date->shouldReceive('maximumJulianDay')->andReturn(2390364);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDaySlashMonthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php
index bafb8c0b72..5319f0c07a 100644
--- a/tests/app/Census/CensusColumnBirthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthDayTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,16 +45,16 @@ class CensusColumnBirthDayTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('30');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDay($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php
index fdd1cbcefe..4cf9a62591 100644
--- a/tests/app/Census/CensusColumnBirthMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,16 +45,16 @@ class CensusColumnBirthMonthTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('Jan');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthMonth($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
index 57f72ecf5f..9899070f94 100644
--- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -44,7 +45,7 @@ class CensusColumnBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase
      */
     private function getPlaceMock($place): Place
     {
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
 
         return $placeMock;
@@ -58,10 +59,10 @@ class CensusColumnBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testForeignCountry()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Westminster, London, England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -77,10 +78,10 @@ class CensusColumnBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testJustCountry()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('United States'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -96,10 +97,10 @@ class CensusColumnBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testKnownState()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Maryland, United States'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -115,10 +116,10 @@ class CensusColumnBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testKnownStateAndTown()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php
index 261403a964..84dad61aa4 100644
--- a/tests/app/Census/CensusColumnBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -44,7 +45,7 @@ class CensusColumnBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     private function getPlaceMock($place): Place
     {
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
 
         return $placeMock;
@@ -58,10 +59,10 @@ class CensusColumnBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceCountry()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Westminster, London, England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
@@ -77,10 +78,10 @@ class CensusColumnBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceAndCountry()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
@@ -96,10 +97,10 @@ class CensusColumnBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDifferentCountry()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Paris, France'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php
index 9e4398fe02..75d6e09a10 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -17,6 +17,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Date\GregorianDate;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,16 +45,16 @@ class CensusColumnBirthYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn()
     {
-        $cal_date = Mockery::mock('Fisharebest\Webtrees\Date\GregorianDate');
+        $cal_date = Mockery::mock(GregorianDate::class);
         $cal_date->shouldReceive('format')->andReturn('1800');
 
-        $date = Mockery::mock('Fisharebest\Webtrees\Date');
+        $date = Mockery::mock(Date::class);
         $date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php
index b5bf84929a..c0e62f6940 100644
--- a/tests/app/Census/CensusColumnBornForeignPartsTest.php
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -46,7 +47,7 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
         $placeMock->shouldReceive('lastPart')->andReturn(end($placeParts));
 
@@ -61,10 +62,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornEnglandCensusEngland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -80,10 +81,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornWalesCensusEngland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -99,10 +100,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornScotlandCensusEngland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -118,10 +119,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornIrelandCensusEngland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -137,10 +138,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornForeignCensusEngland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Elbonia'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -156,10 +157,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornEnglandCensusIreland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -175,10 +176,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornWalesCensusIreland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -194,10 +195,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornScotlandCensusIreland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -213,10 +214,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornIrelandCensusIreland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -232,10 +233,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornForeignCensusIreland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Elbonia'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -251,10 +252,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornEnglandCensusScotland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -270,10 +271,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornWalesCensusScotland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -289,10 +290,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornScotlandCensusScotland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -308,10 +309,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornIrelandCensusScotland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -327,10 +328,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornForeignCensusScotland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Elbonia'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -346,10 +347,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornEnglandCensusWales()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -365,10 +366,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornWalesCensusWales()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -384,10 +385,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornScotlandCensusWales()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -403,10 +404,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornIrelandCensusWales()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -422,10 +423,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornForeignCensusWales()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Elbonia'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -441,10 +442,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornNowhereCensusEngland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock(''));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -460,10 +461,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornNowhereCensusWales()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock(''));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -479,10 +480,10 @@ class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBornNowhereCensusScotland()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock(''));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
index eef3cc7e89..0fce2149a8 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +45,10 @@ class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
 
@@ -62,26 +64,26 @@ class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase
     public function testCountChildren()
     {
         // Stillborn
-        $child1 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child1 = Mockery::mock(Individual::class);
         $child1->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
         $child1->shouldReceive('getDeathDate')->andReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child2 = Mockery::mock(Individual::class);
         $child2->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
         $child2->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child3 = Mockery::mock(Individual::class);
         $child3->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
         $child3->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child4 = Mockery::mock(Individual::class);
         $child4->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
         $child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getChildren')->andReturn([
             $child1,
             $child2,
@@ -89,11 +91,11 @@ class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase
             $child4,
         ]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php
index 3f7d824f9d..efb8b1975d 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +44,10 @@ class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnChildrenDied($census, '', '');
 
@@ -62,26 +63,26 @@ class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase
     public function testCountChildren()
     {
         // Stillborn
-        $child1 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child1 = Mockery::mock(Individual::class);
         $child1->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
         $child1->shouldReceive('getDeathDate')->andReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child2 = Mockery::mock(Individual::class);
         $child2->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
         $child2->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child3 = Mockery::mock(Individual::class);
         $child3->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
         $child3->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child4 = Mockery::mock(Individual::class);
         $child4->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
         $child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getChildren')->andReturn([
             $child1,
             $child2,
@@ -89,11 +90,11 @@ class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase
             $child4,
         ]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
 
         $column = new CensusColumnChildrenDied($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php
index ac067caae1..94ccae7f6c 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +45,10 @@ class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnChildrenLiving($census, '', '');
 
@@ -62,26 +64,26 @@ class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase
     public function testCountChildren()
     {
         // Stillborn
-        $child1 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child1 = Mockery::mock(Individual::class);
         $child1->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
         $child1->shouldReceive('getDeathDate')->andReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child2 = Mockery::mock(Individual::class);
         $child2->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
         $child2->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child3 = Mockery::mock(Individual::class);
         $child3->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
         $child3->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $child4 = Mockery::mock(Individual::class);
         $child4->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
         $child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getChildren')->andReturn([
             $child1,
             $child2,
@@ -89,11 +91,11 @@ class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase
             $child4,
         ]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
 
         $column = new CensusColumnChildrenLiving($census, '', '');
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 1772ede313..c45f3d3473 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 4a689eea4a..f6038ad789 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 32ddfed735..e41b4a9653 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index c4bbcef4fa..c90d7d30a8 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index 8b6d578810..b76b343f81 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index 56067fdf51..3b4c3e1ba4 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 85c14274d7..dd0b4c8d94 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 666f97725c..0fe1bdb0b2 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 72c10a3fbe..2b0c88607a 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,12 +46,12 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -64,12 +67,12 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamiliesFemale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -85,16 +88,16 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -110,16 +113,16 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyFactsFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -135,22 +138,22 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -166,22 +169,22 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSpouseDeadFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $spouse = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $spouse = Mockery::mock(Individual::class);
         $spouse->shouldReceive('getDeathDate')->andReturn(new Date('1820'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -197,16 +200,16 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -222,16 +225,16 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoFamilyUnmarriedFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -247,16 +250,16 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildMale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -272,16 +275,16 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testChildFemale()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
         $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -297,18 +300,18 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedMale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -324,18 +327,18 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDivorcedFemale()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
         $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
index ef2eb6e89f..b2b4686f86 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -46,7 +48,7 @@ class CensusColumnFatherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestC
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
         $placeMock->shouldReceive('lastPart')->andReturn(end($placeParts));
 
@@ -61,16 +63,16 @@ class CensusColumnFatherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestC
      */
     public function testKnownStateAndTown()
     {
-        $father = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $father = Mockery::mock(Individual::class);
         $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn($father);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('United States');
 
         $column = new CensusColumnFatherBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
index c5e2ea3ea8..0abe1d58a4 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -46,7 +48,7 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
         $placeMock->shouldReceive('lastPart')->andReturn(end($placeParts));
 
@@ -61,16 +63,16 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSameCountry()
     {
-        $father = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $father = Mockery::mock(Individual::class);
         $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn($father);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -86,16 +88,16 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDifferentCountry()
     {
-        $father = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $father = Mockery::mock(Individual::class);
         $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn($father);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -111,13 +113,13 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParent()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn(null);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -133,10 +135,10 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParentFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php
index 0de6e37733..68eaffaf7d 100644
--- a/tests/app/Census/CensusColumnFatherForeignTest.php
+++ b/tests/app/Census/CensusColumnFatherForeignTest.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -44,7 +46,7 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     private function getPlaceMock($place): Place
     {
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
 
         return $placeMock;
@@ -58,16 +60,16 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSameCountry()
     {
-        $father = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $father = Mockery::mock(Individual::class);
         $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn($father);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -83,16 +85,16 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDifferentCountry()
     {
-        $father = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $father = Mockery::mock(Individual::class);
         $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn($father);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -108,13 +110,13 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParent()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getHusband')->andReturn(null);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -130,10 +132,10 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParentFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index 601eb795f5..2afd9de337 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,11 +43,11 @@ class CensusColumnFullNameTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFullName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([['full' => 'Joe Bloggs']]);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('');
 
         $column = new CensusColumnFullName($census, '', '');
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index bfb7823248..55ff5a359e 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnGivenNameInitialTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testOneGivenName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe']]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -60,10 +61,10 @@ class CensusColumnGivenNameInitialTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMultipleGivenNames()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe Fred']]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -78,10 +79,10 @@ class CensusColumnGivenNameInitialTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index 3d8d13dc6e..6885f0a827 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnGivenNamesTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGivenNames()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([['givn' => 'Joe']]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnGivenNames($census, '', '');
 
@@ -60,10 +61,10 @@ class CensusColumnGivenNamesTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnGivenNames($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 938d14f967..12c6b3325a 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,16 +46,16 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMarriedWithinYear()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -68,16 +71,16 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMarriedOverYearBeforeTheCensus()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -93,16 +96,16 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMarriedAfterTheCensus()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -118,13 +121,13 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoMarriage()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -140,10 +143,10 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
index c3f7261843..83ad6306bb 100644
--- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +44,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testBornWithinYear()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date('01 JAN 1860'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -62,10 +63,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testBornOverYearBeforeTheCensus()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date('01 JAN 1859'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -81,10 +82,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testBornAfterTheCensus()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date('02 JUN 1860'));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 
@@ -102,10 +103,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \Fisharebest\Webtrees\TestCa
      */
     public function testNoBirth()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthDate')->andReturn(new Date(''));
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index 267443e26d..8ec4789978 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,16 +46,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
      */
     public function testMarriedWithinYear()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -68,16 +71,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
      */
     public function testMarriedOverYearBeforeTheCensus()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -93,16 +96,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
      */
     public function testMarriedAfterTheCensus()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -118,13 +121,13 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
      */
     public function testNoMarriage()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -140,10 +143,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
      */
     public function testNoSpouseFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
index c794644d2f..2b3a3cd499 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -46,7 +48,7 @@ class CensusColumnMotherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestC
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
         $placeMock->shouldReceive('lastPart')->andReturn(end($placeParts));
 
@@ -61,16 +63,16 @@ class CensusColumnMotherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestC
      */
     public function testKnownStateAndTown()
     {
-        $father = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $father = Mockery::mock(Individual::class);
         $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn($father);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('United States');
 
         $column = new CensusColumnMotherBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
index fa6b5d2e7e..e0ed5c925d 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -46,7 +48,7 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
         $placeMock->shouldReceive('lastPart')->andReturn(end($placeParts));
 
@@ -61,16 +63,16 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSameCountry()
     {
-        $mother = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $mother = Mockery::mock(Individual::class);
         $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn($mother);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -86,16 +88,16 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDifferentCountry()
     {
-        $mother = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $mother = Mockery::mock(Individual::class);
         $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn($mother);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -111,13 +113,13 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParent()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn(null);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -133,10 +135,10 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParentFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php
index 59ddb1fc05..5cd0ee665d 100644
--- a/tests/app/Census/CensusColumnMotherForeignTest.php
+++ b/tests/app/Census/CensusColumnMotherForeignTest.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -44,7 +46,7 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     private function getPlaceMock($place): Place
     {
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
 
         return $placeMock;
@@ -58,16 +60,16 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSameCountry()
     {
-        $mother = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $mother = Mockery::mock(Individual::class);
         $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn($mother);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -83,16 +85,16 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testDifferentCountry()
     {
-        $mother = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $mother = Mockery::mock(Individual::class);
         $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn($mother);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Ireland');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -108,13 +110,13 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParent()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('getWife')->andReturn(null);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -130,10 +132,10 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceNoParentFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 9e4c3fd692..362d157767 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -18,6 +18,8 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Place;
 use Mockery;
 
@@ -45,7 +47,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
      */
     private function getPlaceMock($place): Place
     {
-        $placeMock = Mockery::mock('\Fisharebest\Webtrees\Place');
+        $placeMock = Mockery::mock(Place::class);
         $placeMock->shouldReceive('getGedcomName')->andReturn($place);
 
         return $placeMock;
@@ -59,11 +61,11 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoBirthPlace()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock(''));
         $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('Deutschland');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -79,11 +81,11 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testPlaceCountry()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Australia'));
         $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -99,11 +101,11 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testBritish()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
         $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -122,25 +124,25 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
         $place1 = Mockery::mock('Fisharebest\Webtrees\Place');
         $place1->shouldReceive('getGedcomName')->andReturn('United States');
 
-        $fact1 = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact1 = Mockery::mock(Fact::class);
         $fact1->shouldReceive('place')->andReturn($place1);
         $fact1->shouldReceive('date')->andReturn(new Date('1855'));
 
         $place2 = Mockery::mock('Fisharebest\Webtrees\Place');
         $place2->shouldReceive('getGedcomName')->andReturn('Australia');
 
-        $fact2 = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact2 = Mockery::mock(Fact::class);
         $fact2->shouldReceive('place')->andReturn($place2);
         $fact2->shouldReceive('date')->andReturn(new Date('1865'));
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
         $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([
             $fact1,
             $fact2,
         ]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusPlace')->andReturn('England');
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php
index b766d31b83..8fde7c59b2 100644
--- a/tests/app/Census/CensusColumnNullTest.php
+++ b/tests/app/Census/CensusColumnNullTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,9 +43,9 @@ class CensusColumnNullTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNull()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnNull($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 7fb2f94bd7..0a511d9b16 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoOccupation()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('facts')->with(['OCCU'])->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnOccupation($census, '', '');
 
@@ -60,13 +61,13 @@ class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testOccupation()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('value')->andReturn('Farmer');
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('facts')->with(['OCCU'])->andReturn([$fact]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnOccupation($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
index b07d47d074..edf5af6b60 100644
--- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,9 +43,9 @@ class CensusColumnRelationToHeadGermanTest extends \Fisharebest\Webtrees\TestCas
      */
     public function testNull()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnRelationToHeadGerman($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php
index b5350b635f..c9c69495c6 100644
--- a/tests/app/Census/CensusColumnRelationToHeadTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,9 +43,9 @@ class CensusColumnRelationToHeadTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNull()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnRelationToHead($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 566dd87ced..67abc0d501 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,9 +43,9 @@ class CensusColumnReligionTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testReligion()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnReligion($census, '', '');
diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php
index d0592c9332..170f17bd4c 100644
--- a/tests/app/Census/CensusColumnSexMFTest.php
+++ b/tests/app/Census/CensusColumnSexMFTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
@@ -60,10 +61,10 @@ class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFeale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
@@ -78,10 +79,10 @@ class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
index 42b691aafc..df0e6a370d 100644
--- a/tests/app/Census/CensusColumnSexMKTest.php
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
@@ -60,10 +61,10 @@ class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFeale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
@@ -78,10 +79,10 @@ class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php
index c9b754ae6b..74fca2e90f 100644
--- a/tests/app/Census/CensusColumnSexMZTest.php
+++ b/tests/app/Census/CensusColumnSexMZTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('M');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
@@ -60,10 +61,10 @@ class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testFeale()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('F');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
@@ -78,10 +79,10 @@ class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUnknownSex()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSex')->andReturn('U');
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index 59ec3a05cf..6521b5d774 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,7 +43,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\Test
      */
     public function testOneGivenName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([
             [
                 'givn' => 'Joe',
@@ -51,7 +52,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\Test
         ]);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('');
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
@@ -67,7 +68,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\Test
      */
     public function testMultipleGivenNames()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([
             [
                 'givn' => 'Joe Fred',
@@ -76,7 +77,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\Test
         ]);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('');
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
index fde8190357..e292884693 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,7 +43,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testOneGivenName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([
             [
                 'givn' => 'Joe',
@@ -51,7 +52,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase
         ]);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
@@ -67,7 +68,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMultipleGivenNames()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([
             [
                 'givn' => 'Joe Fred',
@@ -76,7 +77,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase
         ]);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
@@ -92,11 +93,11 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([]);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php
index fb628d5a1d..3e8985f4ff 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -42,10 +43,10 @@ class CensusColumnSurnameTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testSurname()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([['surname' => 'Bloggs']]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSurname($census, '', '');
 
@@ -60,10 +61,10 @@ class CensusColumnSurnameTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoName()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getAllNames')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
 
         $column = new CensusColumnSurname($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index add89696c9..673dcc201f 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -18,6 +18,9 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
 use Mockery;
 
 /**
@@ -43,10 +46,10 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoSpouseFamily()
     {
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -62,13 +65,13 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testNoMarriage()
     {
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -84,16 +87,16 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testUndatedMarriage()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date(''));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -109,16 +112,16 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMarriageAfterCensus()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('1861'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -134,16 +137,16 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testMarriageBeforeCensus()
     {
-        $fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+        $fact = Mockery::mock(Fact::class);
         $fact->shouldReceive('date')->andReturn(new Date('OCT 1851'));
 
-        $family = Mockery::mock('Fisharebest\Webtrees\Family');
+        $family = Mockery::mock(Family::class);
         $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
-        $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+        $individual = Mockery::mock(Individual::class);
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
 
-        $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+        $census = Mockery::mock(CensusInterface::class);
         $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
diff --git a/tests/app/PlaceTest.php b/tests/app/PlaceTest.php
index acc764cf24..c21d0a4d90 100644
--- a/tests/app/PlaceTest.php
+++ b/tests/app/PlaceTest.php
@@ -13,8 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 declare(strict_types=1);
 
+use Fisharebest\Webtrees\Place;
 
 /**
  * Test harness for the class Place
@@ -28,6 +30,6 @@ class PlaceTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testClassExists()
     {
-        $this->assertTrue(class_exists('\Fisharebest\Webtrees\Place'));
+        $this->assertTrue(class_exists(Place::class));
     }
 }