Update PHPunit tests, to distinguish stubs from mocks

22 files changed, 112 insertions, 112 deletions

diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 8dca70fad7..3030f65f8c 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -36,7 +36,7 @@ class CensusColumnAgeMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -67,7 +67,7 @@ class CensusColumnAgeMarriedTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
index 814f666675..a385372dd6 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
index eebc038fe8..fc0f0cc1f8 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaTest.php b/tests/app/Census/CensusColumnConditionCanadaTest.php
index a3970ce038..528154edef 100644
--- a/tests/app/Census/CensusColumnConditionCanadaTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
index 0c19571618..5a79c187b5 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
index 418a583f82..ff902d625d 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
index 631f427212..82d56c9ee5 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 04866474bc..62c8c6819a 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index b210e729eb..5b34feddd5 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 725a44b97c..7f12c13471 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 2070765521..7d041a540f 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index a3418d8365..1660d67820 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index ecd70dd926..0b39fade27 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 284f1a7c8e..58ca49cfb8 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 07184aa2fd..7ebaf84da1 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -163,7 +163,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -182,7 +182,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -201,7 +201,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -220,7 +220,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 205775f9fb..6ce674b433 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 80216605b6..fea7ce84a0 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -36,7 +36,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -55,7 +55,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -74,7 +74,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -90,7 +90,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index 5dbf59abe8..e2c5e6f0af 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -36,7 +36,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -55,7 +55,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -74,7 +74,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -90,7 +90,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 35ab08ad4d..6472371925 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -41,7 +41,7 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testNoBirthPlace(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
@@ -55,7 +55,7 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testPlaceCountry(): void
     {
-        $individual = self::createStub(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());
 
@@ -69,7 +69,7 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testBritish(): void
     {
-        $individual = self::createStub(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());
 
@@ -97,7 +97,7 @@ class CensusColumnNationalityTest extends TestCase
         $fact2->method('place')->willReturn($place2);
         $fact2->method('date')->willReturn(new Date('1865'));
 
-        $individual = self::createStub(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,
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 2aee86cf27..e8b4ec7d50 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -31,7 +31,7 @@ class CensusColumnOccupationTest extends TestCase
 {
     public function testNoOccupation(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection());
 
         $census = self::createStub(CensusInterface::class);
@@ -46,7 +46,7 @@ class CensusColumnOccupationTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('value')->willReturn('Farmer');
 
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection([$fact]));
 
         $census = self::createStub(CensusInterface::class);
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 9120a07822..8e6da82e68 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -47,7 +47,7 @@ class CensusColumnReligionTest extends TestCase
 
     public function testRecordReligion(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $fact       = self::createStub(Fact::class);
         $fact->method('value')->willReturn('Jedi');
         $individual->method('facts')->with(['RELI'])->willReturn(new Collection([$fact]));
@@ -62,7 +62,7 @@ class CensusColumnReligionTest extends TestCase
     public function testEventReligion(): void
     {
         $individual = $this->createMock(Individual::class);
-        $fact       = self::createStub(Fact::class);
+        $fact       = $this->createMock(Fact::class);
         $fact->method('attribute')->with('RELI')->willReturn('Jedi');
         $individual
             ->expects($this->exactly(2))
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index 72195a2ea1..e9eb02e334 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -46,7 +46,7 @@ class CensusColumnYearsMarriedTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
@@ -65,7 +65,7 @@ class CensusColumnYearsMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date(''));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -84,7 +84,7 @@ class CensusColumnYearsMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('1861'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -103,7 +103,7 @@ class CensusColumnYearsMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('OCT 1851'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);