Fix: #4026 - Unit test failure

64 files changed, 1038 insertions, 1038 deletions

diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
index f73df84b1e..7ce3d6b21b 100644
--- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
@@ -54,11 +54,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
      */
     public function testFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -74,11 +74,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -94,11 +94,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
      */
     public function testLessThanOneYear(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -114,11 +114,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
      */
     public function testLessThanFifteenYears(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1814');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -134,11 +134,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
      */
     public function testRoundedDownToFiveYears(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1844');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php
index 58715aa00b..eb5692f0c8 100644
--- a/tests/app/Census/CensusColumnAgeFemaleTest.php
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeFemaleTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
@@ -54,11 +54,11 @@ class CensusColumnAgeFemaleTest extends TestCase
      */
     public function testFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeFemale($census, '', '');
@@ -74,11 +74,11 @@ class CensusColumnAgeFemaleTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeFemale($census, '', '');
@@ -94,11 +94,11 @@ class CensusColumnAgeFemaleTest extends TestCase
      */
     public function testLessThanOneYear(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeFemale($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
index 4d0da5b0e6..d223b1ba98 100644
--- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -36,11 +36,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -56,10 +56,10 @@ class CensusColumnAgeMale5YearsTest extends TestCase
      */
     public function testFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
@@ -74,11 +74,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -94,11 +94,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
      */
     public function testLessThanOneYear(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -114,11 +114,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
      */
     public function testLessThanFifteenYears(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1814');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -134,11 +134,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
      */
     public function testRoundedDownToFiveYears(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1844');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php
index 9c907c3fbc..2b5098a489 100644
--- a/tests/app/Census/CensusColumnAgeMaleTest.php
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -36,11 +36,11 @@ class CensusColumnAgeMaleTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeMale($census, '', '');
@@ -56,10 +56,10 @@ class CensusColumnAgeMaleTest extends TestCase
      */
     public function testFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnAgeMale($census, '', '');
 
@@ -74,11 +74,11 @@ class CensusColumnAgeMaleTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeMale($census, '', '');
@@ -94,11 +94,11 @@ class CensusColumnAgeMaleTest extends TestCase
      */
     public function testLessThanOneYear(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeMale($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 01214b37d5..4efab223a5 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -39,17 +39,17 @@ class CensusColumnAgeMarriedTest extends TestCase
      */
     public function testAgeMarried(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('15 MAR 1840'));
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -65,11 +65,11 @@ class CensusColumnAgeMarriedTest extends TestCase
      */
     public function testNoBirthDate(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date(''));
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -85,14 +85,14 @@ class CensusColumnAgeMarriedTest extends TestCase
      */
     public function testNoMarriage(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date(''));
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -108,11 +108,11 @@ class CensusColumnAgeMarriedTest extends TestCase
      */
     public function testNoSpouseFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('15 MAR 1840'));
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
index efd1559a20..adb08c39b9 100644
--- a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
+++ b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeNextBirthDayTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeNextBirthDay($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php
index be1ec1a09a..56539ec718 100644
--- a/tests/app/Census/CensusColumnAgeTest.php
+++ b/tests/app/Census/CensusColumnAgeTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAge($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php
index c01d1c5b9c..3149b80f24 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -36,10 +36,10 @@ class CensusColumnBirthDateTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDate($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
index d4014b5f80..ea10ce4dc9 100644
--- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
@@ -36,10 +36,10 @@ class CensusColumnBirthDayDotMonthYearTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDayDotMonthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
index e8d97b4c90..be5ebf0a89 100644
--- a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
@@ -36,10 +36,10 @@ class CensusColumnBirthDayMonthYearTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDayMonthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
index 8fec7eb5da..7e9ae85519 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -36,10 +36,10 @@ class CensusColumnBirthDaySlashMonthTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDaySlashMonth($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
index fca865afd1..72686f8e3f 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -36,10 +36,10 @@ class CensusColumnBirthDaySlashMonthYearTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDaySlashMonthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php
index 28be819951..ee1815fa61 100644
--- a/tests/app/Census/CensusColumnBirthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthDayTest.php
@@ -37,16 +37,16 @@ class CensusColumnBirthDayTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
+        $cal_date = $this->createMock(GregorianDate::class);
         $cal_date->method('format')->willReturn('30');
 
-        $date = self::createMock(Date::class);
+        $date = $this->createMock(Date::class);
         $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDay($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthMonthDayTest.php b/tests/app/Census/CensusColumnBirthMonthDayTest.php
index e7bc107a4a..b723fee2c2 100644
--- a/tests/app/Census/CensusColumnBirthMonthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthDayTest.php
@@ -36,10 +36,10 @@ class CensusColumnBirthMonthDayTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthMonthDay($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php
index 975b6068c4..86543836ac 100644
--- a/tests/app/Census/CensusColumnBirthMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthTest.php
@@ -37,16 +37,16 @@ class CensusColumnBirthMonthTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
+        $cal_date = $this->createMock(GregorianDate::class);
         $cal_date->method('format')->willReturn('Jan');
 
-        $date = self::createMock(Date::class);
+        $date = $this->createMock(Date::class);
         $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthMonth($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
index 36d5977473..ebb536aa3e 100644
--- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
@@ -37,7 +37,7 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
      */
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -51,10 +51,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
      */
     public function testForeignCountry(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Westminster, London, England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -70,10 +70,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
      */
     public function testJustCountry(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('United States'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -89,10 +89,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
      */
     public function testKnownState(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Maryland, United States'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -108,10 +108,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
      */
     public function testKnownStateAndTown(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php
index cda6dc1954..b639152bc9 100644
--- a/tests/app/Census/CensusColumnBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceTest.php
@@ -37,7 +37,7 @@ class CensusColumnBirthPlaceTest extends TestCase
      */
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -51,10 +51,10 @@ class CensusColumnBirthPlaceTest extends TestCase
      */
     public function testPlaceCountry(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Westminster, London, England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
@@ -70,10 +70,10 @@ class CensusColumnBirthPlaceTest extends TestCase
      */
     public function testPlaceAndCountry(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
@@ -89,10 +89,10 @@ class CensusColumnBirthPlaceTest extends TestCase
      */
     public function testDifferentCountry(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Paris, France'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php
index 22fa9a551a..3caef0e343 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -37,16 +37,16 @@ class CensusColumnBirthYearTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
+        $cal_date = $this->createMock(GregorianDate::class);
         $cal_date->method('format')->willReturn('1800');
 
-        $date = self::createMock(Date::class);
+        $date = $this->createMock(Date::class);
         $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php
index 2dc7bd0dcf..626dabdad5 100644
--- a/tests/app/Census/CensusColumnBornForeignPartsTest.php
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -40,7 +40,7 @@ class CensusColumnBornForeignPartsTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn((new Collection($placeParts))->slice(-1));
 
@@ -55,10 +55,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornEnglandCensusEngland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -74,10 +74,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornWalesCensusEngland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -93,10 +93,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornScotlandCensusEngland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -112,10 +112,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornIrelandCensusEngland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -131,10 +131,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornForeignCensusEngland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -150,10 +150,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornEnglandCensusIreland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -169,10 +169,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornWalesCensusIreland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -188,10 +188,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornScotlandCensusIreland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -207,10 +207,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornIrelandCensusIreland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -226,10 +226,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornForeignCensusIreland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -245,10 +245,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornEnglandCensusScotland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -264,10 +264,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornWalesCensusScotland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -283,10 +283,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornScotlandCensusScotland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -302,10 +302,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornIrelandCensusScotland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -321,10 +321,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornForeignCensusScotland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -340,10 +340,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornEnglandCensusWales(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -359,10 +359,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornWalesCensusWales(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -378,10 +378,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornScotlandCensusWales(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -397,10 +397,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornIrelandCensusWales(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -416,10 +416,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornForeignCensusWales(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -435,10 +435,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornNowhereCensusEngland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -454,10 +454,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornNowhereCensusWales(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -473,10 +473,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
      */
     public function testBornNowhereCensusScotland(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
index 7a2bea304a..296ab1cedf 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -38,11 +38,11 @@ class CensusColumnChildrenBornAliveTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
 
@@ -58,26 +58,26 @@ class CensusColumnChildrenBornAliveTest extends TestCase
     public function testCountChildren(): void
     {
         // Stillborn
-        $child1 = self::createMock(Individual::class);
+        $child1 = $this->createMock(Individual::class);
         $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = self::createMock(Individual::class);
+        $child2 = $this->createMock(Individual::class);
         $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = self::createMock(Individual::class);
+        $child3 = $this->createMock(Individual::class);
         $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = self::createMock(Individual::class);
+        $child4 = $this->createMock(Individual::class);
         $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child4->method('getDeathDate')->willReturn(new Date(''));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('children')->willReturn(new Collection([
             $child1,
             $child2,
@@ -85,11 +85,11 @@ class CensusColumnChildrenBornAliveTest extends TestCase
             $child4,
         ]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 MAR 1911');
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php
index 3021eedb11..d2787924b6 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -38,11 +38,11 @@ class CensusColumnChildrenDiedTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnChildrenDied($census, '', '');
 
@@ -58,33 +58,33 @@ class CensusColumnChildrenDiedTest extends TestCase
     public function testCountChildren(): void
     {
         // Stillborn
-        $child1 = self::createMock(Individual::class);
+        $child1 = $this->createMock(Individual::class);
         $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = self::createMock(Individual::class);
+        $child2 = $this->createMock(Individual::class);
         $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = self::createMock(Individual::class);
+        $child3 = $this->createMock(Individual::class);
         $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = self::createMock(Individual::class);
+        $child4 = $this->createMock(Individual::class);
         $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child4->method('getDeathDate')->willReturn(new Date(''));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('children')->willReturn(new Collection([$child1, $child2, $child3, $child4]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 MAR 1911');
 
         $column = new CensusColumnChildrenDied($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php
index ac7e8f3474..f2908cbea7 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -38,11 +38,11 @@ class CensusColumnChildrenLivingTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnChildrenLiving($census, '', '');
 
@@ -58,26 +58,26 @@ class CensusColumnChildrenLivingTest extends TestCase
     public function testCountChildren(): void
     {
         // Stillborn
-        $child1 = self::createMock(Individual::class);
+        $child1 = $this->createMock(Individual::class);
         $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = self::createMock(Individual::class);
+        $child2 = $this->createMock(Individual::class);
         $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = self::createMock(Individual::class);
+        $child3 = $this->createMock(Individual::class);
         $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = self::createMock(Individual::class);
+        $child4 = $this->createMock(Individual::class);
         $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child4->method('getDeathDate')->willReturn(new Date(''));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('children')->willReturn(new Collection([
             $child1,
             $child2,
@@ -85,11 +85,11 @@ class CensusColumnChildrenLivingTest extends TestCase
             $child4,
         ]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 MAR 1911');
 
         $column = new CensusColumnChildrenLiving($census, '', '');
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
index c35a563067..bea98aef25 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -190,11 +190,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -210,16 +210,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -235,16 +235,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -260,16 +260,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -285,16 +285,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -310,9 +310,9 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -325,11 +325,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -345,9 +345,9 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -360,11 +360,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -380,9 +380,9 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -395,11 +395,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -415,9 +415,9 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -430,11 +430,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
index 98fb0dc8b5..4d2614892b 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -190,11 +190,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -210,16 +210,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -235,16 +235,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -260,16 +260,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -285,16 +285,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -310,9 +310,9 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -325,11 +325,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -345,9 +345,9 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -360,11 +360,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -380,9 +380,9 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -395,11 +395,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -415,9 +415,9 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -430,11 +430,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionCanadaTest.php b/tests/app/Census/CensusColumnConditionCanadaTest.php
index 9c86775804..f7e40bb36f 100644
--- a/tests/app/Census/CensusColumnConditionCanadaTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaTest.php
@@ -40,12 +40,12 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -61,12 +61,12 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -107,16 +107,16 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -132,12 +132,12 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -151,11 +151,11 @@ class CensusColumnConditionCanadaTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -171,12 +171,12 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -191,11 +191,11 @@ class CensusColumnConditionCanadaTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -211,16 +211,16 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -236,16 +236,16 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -261,16 +261,16 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -286,16 +286,16 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -311,9 +311,9 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -326,11 +326,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -346,9 +346,9 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -361,11 +361,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -381,9 +381,9 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -396,11 +396,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -416,9 +416,9 @@ class CensusColumnConditionCanadaTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -431,11 +431,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
index 1befae5585..d87d2aaa46 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -190,11 +190,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -210,16 +210,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -235,16 +235,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -260,16 +260,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -285,16 +285,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -310,9 +310,9 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -325,11 +325,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -345,9 +345,9 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -360,11 +360,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -380,9 +380,9 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -395,11 +395,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -415,9 +415,9 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -430,11 +430,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
index 0918ce9a81..a016169706 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -190,11 +190,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -210,16 +210,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -235,16 +235,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -260,16 +260,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -285,16 +285,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -310,9 +310,9 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -325,11 +325,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -345,9 +345,9 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -360,11 +360,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -380,9 +380,9 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -395,11 +395,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -415,9 +415,9 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -430,11 +430,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
index 26e075e6cf..aa4c2e74ba 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -190,11 +190,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -210,16 +210,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -235,16 +235,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -260,16 +260,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -285,16 +285,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -310,9 +310,9 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -325,11 +325,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -345,9 +345,9 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -360,11 +360,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -380,9 +380,9 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -395,11 +395,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -415,9 +415,9 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -430,11 +430,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 713ba9f0d1..a13d4deba6 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionDanishTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionDanishTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionDanishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionDanishTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionDanishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 37d36c6e87..71765a02e7 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionEnglishTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionEnglishTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionEnglishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionEnglishTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionEnglishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 4bd022000a..d7e39d50ea 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 86e7c8fec1..54b081f654 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index 3cea6de155..bb1e4ce7a0 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index 7c6ddca530..70fd387068 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 48d00e2b74..69abdcda03 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -189,11 +189,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -209,16 +209,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -234,16 +234,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -259,16 +259,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -284,16 +284,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -309,9 +309,9 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -324,11 +324,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -344,9 +344,9 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family
             ->expects(self::exactly(2))
             ->method('facts')
@@ -359,11 +359,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index cac51f3446..3c0f7eea97 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -151,11 +151,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -171,12 +171,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -191,11 +191,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -211,16 +211,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -236,16 +236,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -261,16 +261,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -286,16 +286,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -311,9 +311,9 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -327,11 +327,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -347,9 +347,9 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -363,11 +363,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index b141b824d0..ad22ba8607 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -39,12 +39,12 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -60,12 +60,12 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -106,16 +106,16 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,12 +131,12 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testSpouseDeadMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
@@ -150,11 +150,11 @@ class CensusColumnConditionUsTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -170,12 +170,12 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testSpouseDeadFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $spouse = self::createMock(Individual::class);
+        $spouse = $this->createMock(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -190,11 +190,11 @@ class CensusColumnConditionUsTest extends TestCase
             );
         $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -210,16 +210,16 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -235,16 +235,16 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -260,16 +260,16 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testChildMale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -285,16 +285,16 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testChildFemale(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -310,9 +310,9 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testDivorcedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -325,11 +325,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -345,9 +345,9 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testDivorcedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -360,11 +360,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -380,9 +380,9 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testMarriedMale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -395,11 +395,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -415,9 +415,9 @@ class CensusColumnConditionUsTest extends TestCase
      */
     public function testMarriedFemale(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
             ->expects(self::exactly(2))
@@ -430,11 +430,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection()
             );
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
index d327b9a011..f482794286 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
@@ -41,7 +41,7 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -56,16 +56,16 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase
      */
     public function testKnownStateAndTown(): void
     {
-        $father = self::createMock(Individual::class);
+        $father = $this->createMock(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnFatherBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
index d6479e36d7..e47633aaff 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
@@ -41,7 +41,7 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -56,16 +56,16 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
      */
     public function testSameCountry(): void
     {
-        $father = self::createMock(Individual::class);
+        $father = $this->createMock(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
      */
     public function testDifferentCountry(): void
     {
-        $father = self::createMock(Individual::class);
+        $father = $this->createMock(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -106,13 +106,13 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
      */
     public function testPlaceNoParent(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn(null);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -128,10 +128,10 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
      */
     public function testPlaceNoParentFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php
index 49b84a3ced..c04251a832 100644
--- a/tests/app/Census/CensusColumnFatherForeignTest.php
+++ b/tests/app/Census/CensusColumnFatherForeignTest.php
@@ -39,7 +39,7 @@ class CensusColumnFatherForeignTest extends TestCase
      */
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -53,16 +53,16 @@ class CensusColumnFatherForeignTest extends TestCase
      */
     public function testSameCountry(): void
     {
-        $father = self::createMock(Individual::class);
+        $father = $this->createMock(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -78,16 +78,16 @@ class CensusColumnFatherForeignTest extends TestCase
      */
     public function testDifferentCountry(): void
     {
-        $father = self::createMock(Individual::class);
+        $father = $this->createMock(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -103,13 +103,13 @@ class CensusColumnFatherForeignTest extends TestCase
      */
     public function testPlaceNoParent(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('husband')->willReturn(null);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -125,10 +125,10 @@ class CensusColumnFatherForeignTest extends TestCase
      */
     public function testPlaceNoParentFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index 3e88f755a3..d4708a6d38 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -35,10 +35,10 @@ class CensusColumnGivenNameInitialTest extends TestCase
      */
     public function testOneGivenName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([['givn' => 'Joe']]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnGivenNameInitialTest extends TestCase
      */
     public function testMultipleGivenNames(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([['givn' => 'Joe Fred']]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -71,10 +71,10 @@ class CensusColumnGivenNameInitialTest extends TestCase
      */
     public function testNoName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index c80cd043f7..822cd5f4b4 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -35,10 +35,10 @@ class CensusColumnGivenNamesTest extends TestCase
      */
     public function testGivenNames(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([['givn' => 'Joe']]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnGivenNames($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnGivenNamesTest extends TestCase
      */
     public function testNoName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnGivenNames($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 23bdc00e42..5706fba521 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -39,16 +39,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase
      */
     public function testMarriedWithinYear(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -64,16 +64,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase
      */
     public function testMarriedOverYearBeforeTheCensus(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -89,16 +89,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase
      */
     public function testMarriedAfterTheCensus(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -114,13 +114,13 @@ class CensusColumnMarriedWithinYearTest extends TestCase
      */
     public function testNoMarriage(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -136,10 +136,10 @@ class CensusColumnMarriedWithinYearTest extends TestCase
      */
     public function testNoSpouseFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
index bcf4d60c35..be9f459e2a 100644
--- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
@@ -36,10 +36,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
      */
     public function testBornWithinYear(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('01 JAN 1860'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -55,10 +55,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
      */
     public function testBornOverYearBeforeTheCensus(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('01 JAN 1859'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -74,10 +74,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
      */
     public function testBornAfterTheCensus(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('02 JUN 1860'));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
 
@@ -95,10 +95,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
      */
     public function testNoBirth(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date(''));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index 550b82d1e0..611ba7a758 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -39,16 +39,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
      */
     public function testMarriedWithinYear(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -64,16 +64,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
      */
     public function testMarriedOverYearBeforeTheCensus(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -89,16 +89,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
      */
     public function testMarriedAfterTheCensus(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -114,13 +114,13 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
      */
     public function testNoMarriage(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -136,10 +136,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
      */
     public function testNoSpouseFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
index 426c594a11..b726e85c73 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
@@ -41,7 +41,7 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -56,16 +56,16 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase
      */
     public function testKnownStateAndTown(): void
     {
-        $father = self::createMock(Individual::class);
+        $father = $this->createMock(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn($father);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnMotherBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
index 049fdfa511..5a13c4d118 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
@@ -41,7 +41,7 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -56,16 +56,16 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
      */
     public function testSameCountry(): void
     {
-        $mother = self::createMock(Individual::class);
+        $mother = $this->createMock(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
      */
     public function testDifferentCountry(): void
     {
-        $mother = self::createMock(Individual::class);
+        $mother = $this->createMock(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -106,13 +106,13 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
      */
     public function testPlaceNoParent(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn(null);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -128,10 +128,10 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
      */
     public function testPlaceNoParentFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php
index c7378a3bc4..dcfed31460 100644
--- a/tests/app/Census/CensusColumnMotherForeignTest.php
+++ b/tests/app/Census/CensusColumnMotherForeignTest.php
@@ -39,7 +39,7 @@ class CensusColumnMotherForeignTest extends TestCase
      */
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -53,16 +53,16 @@ class CensusColumnMotherForeignTest extends TestCase
      */
     public function testSameCountry(): void
     {
-        $mother = self::createMock(Individual::class);
+        $mother = $this->createMock(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -78,16 +78,16 @@ class CensusColumnMotherForeignTest extends TestCase
      */
     public function testDifferentCountry(): void
     {
-        $mother = self::createMock(Individual::class);
+        $mother = $this->createMock(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -103,13 +103,13 @@ class CensusColumnMotherForeignTest extends TestCase
      */
     public function testPlaceNoParent(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('wife')->willReturn(null);
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -125,10 +125,10 @@ class CensusColumnMotherForeignTest extends TestCase
      */
     public function testPlaceNoParentFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index d07cafa133..a1b016d171 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -40,7 +40,7 @@ class CensusColumnNationalityTest extends TestCase
      */
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = self::createMock(Place::class);
+        $placeMock = $this->createMock(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -54,11 +54,11 @@ class CensusColumnNationalityTest extends TestCase
      */
     public function testNoBirthPlace(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Deutschland');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -74,11 +74,11 @@ class CensusColumnNationalityTest extends TestCase
      */
     public function testPlaceCountry(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Australia'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -94,11 +94,11 @@ class CensusColumnNationalityTest extends TestCase
      */
     public function testBritish(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -114,28 +114,28 @@ class CensusColumnNationalityTest extends TestCase
      */
     public function testEmigrated(): void
     {
-        $place1 = self::createMock(Place::class);
+        $place1 = $this->createMock(Place::class);
         $place1->method('gedcomName')->willReturn('United States');
 
-        $fact1 = self::createMock(Fact::class);
+        $fact1 = $this->createMock(Fact::class);
         $fact1->method('place')->willReturn($place1);
         $fact1->method('date')->willReturn(new Date('1855'));
 
-        $place2 = self::createMock(Place::class);
+        $place2 = $this->createMock(Place::class);
         $place2->method('gedcomName')->willReturn('Australia');
 
-        $fact2 = self::createMock(Fact::class);
+        $fact2 = $this->createMock(Fact::class);
         $fact2->method('place')->willReturn($place2);
         $fact2->method('date')->willReturn(new Date('1865'));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection([
             $fact1,
             $fact2,
         ]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php
index 370db7ec36..065c463946 100644
--- a/tests/app/Census/CensusColumnNullTest.php
+++ b/tests/app/Census/CensusColumnNullTest.php
@@ -35,9 +35,9 @@ class CensusColumnNullTest extends TestCase
      */
     public function testNull(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnNull($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 2fff7e91fc..ba07be7256 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -37,10 +37,10 @@ class CensusColumnOccupationTest extends TestCase
      */
     public function testNoOccupation(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnOccupation($census, '', '');
 
@@ -55,13 +55,13 @@ class CensusColumnOccupationTest extends TestCase
      */
     public function testOccupation(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('value')->willReturn('Farmer');
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection([$fact]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnOccupation($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
index 07912c14da..9b072f9adc 100644
--- a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
@@ -36,9 +36,9 @@ class CensusColumnRelationToHeadEnglishTest extends TestCase
      */
     public function testNull(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnRelationToHeadEnglish($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
index f1d2db20b4..530ffaf335 100644
--- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
@@ -36,9 +36,9 @@ class CensusColumnRelationToHeadGermanTest extends TestCase
      */
     public function testNull(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnRelationToHeadGerman($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php
index 29b161c7fc..091e67612a 100644
--- a/tests/app/Census/CensusColumnRelationToHeadTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadTest.php
@@ -35,9 +35,9 @@ class CensusColumnRelationToHeadTest extends TestCase
      */
     public function testNull(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnRelationToHead($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 50352a05b0..53e4e6f2c7 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -36,14 +36,14 @@ class CensusColumnReligionTest extends TestCase
      */
     public function testNoReligion(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual
             ->expects(self::exactly(2))
             ->method('facts')
             ->withConsecutive([['RELI']], [])
             ->willReturnOnConsecutiveCalls(new Collection(), new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnReligion($census, '', '');
 
@@ -57,12 +57,12 @@ class CensusColumnReligionTest extends TestCase
      */
     public function testRecordReligion(): void
     {
-        $individual = self::createMock(Individual::class);
-        $fact       = self::createMock(Fact::class);
+        $individual = $this->createMock(Individual::class);
+        $fact       = $this->createMock(Fact::class);
         $fact->method('value')->willReturn('Jedi');
         $individual->method('facts')->with(['RELI'])->willReturn(new Collection([$fact]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnReligion($census, '', '');
 
@@ -76,8 +76,8 @@ class CensusColumnReligionTest extends TestCase
      */
     public function testEventReligion(): void
     {
-        $individual = self::createMock(Individual::class);
-        $fact       = self::createMock(Fact::class);
+        $individual = $this->createMock(Individual::class);
+        $fact       = $this->createMock(Fact::class);
         $fact->method('attribute')->with('RELI')->willReturn('Jedi');
         $individual
             ->expects(self::exactly(2))
@@ -91,7 +91,7 @@ class CensusColumnReligionTest extends TestCase
                 new Collection([$fact])
             );
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnReligion($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexFTest.php b/tests/app/Census/CensusColumnSexFTest.php
index 05c808ec63..8c1dfbf335 100644
--- a/tests/app/Census/CensusColumnSexFTest.php
+++ b/tests/app/Census/CensusColumnSexFTest.php
@@ -38,10 +38,10 @@ class CensusColumnSexFTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexF($census, '', '');
 
@@ -56,10 +56,10 @@ class CensusColumnSexFTest extends TestCase
      */
     public function testFeale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexF($census, '', '');
 
@@ -74,10 +74,10 @@ class CensusColumnSexFTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexF($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php
index 6d38e83146..7b5c008533 100644
--- a/tests/app/Census/CensusColumnSexMFTest.php
+++ b/tests/app/Census/CensusColumnSexMFTest.php
@@ -35,10 +35,10 @@ class CensusColumnSexMFTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMFTest extends TestCase
      */
     public function testFeale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
@@ -71,10 +71,10 @@ class CensusColumnSexMFTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
index 237002fe44..076ab491bd 100644
--- a/tests/app/Census/CensusColumnSexMKTest.php
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -35,10 +35,10 @@ class CensusColumnSexMKTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMKTest extends TestCase
      */
     public function testFeale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
@@ -71,10 +71,10 @@ class CensusColumnSexMKTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMTest.php b/tests/app/Census/CensusColumnSexMTest.php
index fa23fa476a..ab7a045bec 100644
--- a/tests/app/Census/CensusColumnSexMTest.php
+++ b/tests/app/Census/CensusColumnSexMTest.php
@@ -38,10 +38,10 @@ class CensusColumnSexMTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexM($census, '', '');
 
@@ -56,10 +56,10 @@ class CensusColumnSexMTest extends TestCase
      */
     public function testFeale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexM($census, '', '');
 
@@ -74,10 +74,10 @@ class CensusColumnSexMTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexM($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php
index f32ca4e8c0..a89d39324e 100644
--- a/tests/app/Census/CensusColumnSexMZTest.php
+++ b/tests/app/Census/CensusColumnSexMZTest.php
@@ -35,10 +35,10 @@ class CensusColumnSexMZTest extends TestCase
      */
     public function testMale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMZTest extends TestCase
      */
     public function testFeale(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
@@ -71,10 +71,10 @@ class CensusColumnSexMZTest extends TestCase
      */
     public function testUnknownSex(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index 65d567047d..b19ebc46fa 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -36,7 +36,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
      */
     public function testOneGivenName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn' => 'Joe',
@@ -45,7 +45,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
@@ -61,7 +61,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
      */
     public function testMultipleGivenNames(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn' => 'Joe Fred',
@@ -70,7 +70,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
index 0edff8a83d..00ea537963 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
@@ -36,7 +36,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
      */
     public function testOneGivenName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn' => 'Joe',
@@ -45,7 +45,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
@@ -61,7 +61,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
      */
     public function testMultipleGivenNames(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn'    => 'Joe Fred',
@@ -70,7 +70,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
@@ -86,7 +86,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
      */
     public function testNoName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn'    => Individual::PRAENOMEN_NESCIO,
@@ -95,7 +95,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php
index 818f44278c..d1beeb6657 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -35,10 +35,10 @@ class CensusColumnSurnameTest extends TestCase
      */
     public function testSurname(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([['surname' => 'Bloggs']]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSurname($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSurnameTest extends TestCase
      */
     public function testNoName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getAllNames')->willReturn([]);
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
 
         $column = new CensusColumnSurname($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index de9170e1ae..83821ebd6a 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -39,10 +39,10 @@ class CensusColumnYearsMarriedTest extends TestCase
      */
     public function testNoSpouseFamily(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -58,13 +58,13 @@ class CensusColumnYearsMarriedTest extends TestCase
      */
     public function testNoMarriage(): void
     {
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection());
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -80,16 +80,16 @@ class CensusColumnYearsMarriedTest extends TestCase
      */
     public function testUndatedMarriage(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date(''));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -105,16 +105,16 @@ class CensusColumnYearsMarriedTest extends TestCase
      */
     public function testMarriageAfterCensus(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('1861'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -130,16 +130,16 @@ class CensusColumnYearsMarriedTest extends TestCase
      */
     public function testMarriageBeforeCensus(): void
     {
-        $fact = self::createMock(Fact::class);
+        $fact = $this->createMock(Fact::class);
         $fact->method('date')->willReturn(new Date('OCT 1851'));
 
-        $family = self::createMock(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = self::createMock(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = self::createMock(CensusInterface::class);
+        $census = $this->createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');