PHPunit: mock objects have expectations, stubs do not

65 files changed, 1046 insertions, 1046 deletions

diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
index 23c3964c48..9b3419b2e3 100644
--- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -30,10 +30,10 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
@@ -42,11 +42,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
 
     public function testFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -56,11 +56,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -70,11 +70,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
 
     public function testLessThanOneYear(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -84,11 +84,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
 
     public function testLessThanFifteenYears(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1814');
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -98,11 +98,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase
 
     public function testRoundedDownToFiveYears(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 3c317e0bf0..7725f5f6a2 100644
--- a/tests/app/Census/CensusColumnAgeFemaleTest.php
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -30,10 +30,10 @@ class CensusColumnAgeFemaleTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
@@ -42,11 +42,11 @@ class CensusColumnAgeFemaleTest extends TestCase
 
     public function testFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeFemale($census, '', '');
@@ -56,11 +56,11 @@ class CensusColumnAgeFemaleTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeFemale($census, '', '');
@@ -70,11 +70,11 @@ class CensusColumnAgeFemaleTest extends TestCase
 
     public function testLessThanOneYear(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 a27ea7df63..bb1da0550d 100644
--- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -30,11 +30,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -44,10 +44,10 @@ class CensusColumnAgeMale5YearsTest extends TestCase
 
     public function testFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
@@ -56,11 +56,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -70,11 +70,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
 
     public function testLessThanOneYear(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1800');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -84,11 +84,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
 
     public function testLessThanFifteenYears(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1814');
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
@@ -98,11 +98,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase
 
     public function testRoundedDownToFiveYears(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 ee888d6cfa..9fed27173d 100644
--- a/tests/app/Census/CensusColumnAgeMaleTest.php
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -30,11 +30,11 @@ class CensusColumnAgeMaleTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeMale($census, '', '');
@@ -44,10 +44,10 @@ class CensusColumnAgeMaleTest extends TestCase
 
     public function testFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnAgeMale($census, '', '');
 
@@ -56,11 +56,11 @@ class CensusColumnAgeMaleTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnAgeMale($census, '', '');
@@ -70,11 +70,11 @@ class CensusColumnAgeMaleTest extends TestCase
 
     public function testLessThanOneYear(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 04c30120b3..cfd4d1e1bc 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -33,17 +33,17 @@ class CensusColumnAgeMarriedTest extends TestCase
 {
     public function testAgeMarried(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('15 MAR 1840'));
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -53,11 +53,11 @@ class CensusColumnAgeMarriedTest extends TestCase
 
     public function testNoBirthDate(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date(''));
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -67,14 +67,14 @@ class CensusColumnAgeMarriedTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date(''));
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnAgeMarried($census, '', '');
@@ -84,11 +84,11 @@ class CensusColumnAgeMarriedTest extends TestCase
 
     public function testNoSpouseFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('15 MAR 1840'));
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 90c61f247a..3bedaa0034 100644
--- a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
+++ b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php
@@ -30,10 +30,10 @@ class CensusColumnAgeNextBirthDayTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 8ab72cb6f9..d7db04b265 100644
--- a/tests/app/Census/CensusColumnAgeTest.php
+++ b/tests/app/Census/CensusColumnAgeTest.php
@@ -30,10 +30,10 @@ class CensusColumnAgeTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 2d905112a4..ce6e456dd0 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -30,10 +30,10 @@ class CensusColumnBirthDateTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 aa97bebb2d..a90cc0cf80 100644
--- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
@@ -30,10 +30,10 @@ class CensusColumnBirthDayDotMonthYearTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 139594a553..56bf903158 100644
--- a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
@@ -30,10 +30,10 @@ class CensusColumnBirthDayMonthYearTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 ed3bbe5a4c..543885aa58 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -30,10 +30,10 @@ class CensusColumnBirthDaySlashMonthTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 19dbb967de..dbc56f832c 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -30,10 +30,10 @@ class CensusColumnBirthDaySlashMonthYearTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 2e3691a883..522ec5b35d 100644
--- a/tests/app/Census/CensusColumnBirthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthDayTest.php
@@ -31,16 +31,16 @@ class CensusColumnBirthDayTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $cal_date = $this->createMock(GregorianDate::class);
+        $cal_date = $this->createStub(GregorianDate::class);
         $cal_date->method('format')->willReturn('30');
 
-        $date = $this->createMock(Date::class);
+        $date = $this->createStub(Date::class);
         $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 0da93f31a6..9ebd90f4d1 100644
--- a/tests/app/Census/CensusColumnBirthMonthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthDayTest.php
@@ -30,10 +30,10 @@ class CensusColumnBirthMonthDayTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 32d913d64d..36851c3794 100644
--- a/tests/app/Census/CensusColumnBirthMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthTest.php
@@ -31,16 +31,16 @@ class CensusColumnBirthMonthTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $cal_date = $this->createMock(GregorianDate::class);
+        $cal_date = $this->createStub(GregorianDate::class);
         $cal_date->method('format')->willReturn('Jan');
 
-        $date = $this->createMock(Date::class);
+        $date = $this->createStub(Date::class);
         $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 e561e871ea..e713f94fee 100644
--- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
@@ -30,7 +30,7 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -38,10 +38,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
 
     public function testForeignCountry(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Westminster, London, England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -51,10 +51,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
 
     public function testJustCountry(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('United States'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -64,10 +64,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
 
     public function testKnownState(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Maryland, United States'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('United States');
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -77,10 +77,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase
 
     public function testKnownStateAndTown(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 b6b0602238..dc82f38233 100644
--- a/tests/app/Census/CensusColumnBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceTest.php
@@ -30,7 +30,7 @@ class CensusColumnBirthPlaceTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -38,10 +38,10 @@ class CensusColumnBirthPlaceTest extends TestCase
 
     public function testPlaceCountry(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Westminster, London, England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
@@ -51,10 +51,10 @@ class CensusColumnBirthPlaceTest extends TestCase
 
     public function testPlaceAndCountry(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBirthPlace($census, '', '');
@@ -64,10 +64,10 @@ class CensusColumnBirthPlaceTest extends TestCase
 
     public function testDifferentCountry(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Paris, France'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 ec4d013205..f3b2e145f8 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -31,16 +31,16 @@ class CensusColumnBirthYearTest extends TestCase
 {
     public function testGenerateColumn(): void
     {
-        $cal_date = $this->createMock(GregorianDate::class);
+        $cal_date = $this->createStub(GregorianDate::class);
         $cal_date->method('format')->willReturn('1800');
 
-        $date = $this->createMock(Date::class);
+        $date = $this->createStub(Date::class);
         $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 66b347a6b1..17acc9d5ea 100644
--- a/tests/app/Census/CensusColumnBornForeignPartsTest.php
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -33,7 +33,7 @@ class CensusColumnBornForeignPartsTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn((new Collection($placeParts))->slice(-1));
 
@@ -42,10 +42,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornEnglandCensusEngland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -55,10 +55,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornWalesCensusEngland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -68,10 +68,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornScotlandCensusEngland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -81,10 +81,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornIrelandCensusEngland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -94,10 +94,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornForeignCensusEngland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -107,10 +107,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornEnglandCensusIreland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -120,10 +120,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornWalesCensusIreland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -133,10 +133,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornScotlandCensusIreland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -146,10 +146,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornIrelandCensusIreland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -159,10 +159,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornForeignCensusIreland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -172,10 +172,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornEnglandCensusScotland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -185,10 +185,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornWalesCensusScotland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -198,10 +198,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornScotlandCensusScotland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -211,10 +211,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornIrelandCensusScotland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -224,10 +224,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornForeignCensusScotland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Scotland');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -237,10 +237,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornEnglandCensusWales(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -250,10 +250,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornWalesCensusWales(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -263,10 +263,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornScotlandCensusWales(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -276,10 +276,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornIrelandCensusWales(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -289,10 +289,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornForeignCensusWales(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -302,10 +302,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornNowhereCensusEngland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -315,10 +315,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornNowhereCensusWales(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Wales');
 
         $column = new CensusColumnBornForeignParts($census, '', '');
@@ -328,10 +328,10 @@ class CensusColumnBornForeignPartsTest extends TestCase
 
     public function testBornNowhereCensusScotland(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 540417309a..e12be7d92d 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -32,11 +32,11 @@ class CensusColumnChildrenBornAliveTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
 
@@ -46,26 +46,26 @@ class CensusColumnChildrenBornAliveTest extends TestCase
     public function testCountChildren(): void
     {
         // Stillborn
-        $child1 = $this->createMock(Individual::class);
+        $child1 = $this->createStub(Individual::class);
         $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = $this->createMock(Individual::class);
+        $child2 = $this->createStub(Individual::class);
         $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = $this->createMock(Individual::class);
+        $child3 = $this->createStub(Individual::class);
         $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = $this->createMock(Individual::class);
+        $child4 = $this->createStub(Individual::class);
         $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child4->method('getDeathDate')->willReturn(new Date(''));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('children')->willReturn(new Collection([
             $child1,
             $child2,
@@ -73,11 +73,11 @@ class CensusColumnChildrenBornAliveTest extends TestCase
             $child4,
         ]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 5d09ddab1a..a5c0403f90 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -32,11 +32,11 @@ class CensusColumnChildrenDiedTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnChildrenDied($census, '', '');
 
@@ -46,33 +46,33 @@ class CensusColumnChildrenDiedTest extends TestCase
     public function testCountChildren(): void
     {
         // Stillborn
-        $child1 = $this->createMock(Individual::class);
+        $child1 = $this->createStub(Individual::class);
         $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = $this->createMock(Individual::class);
+        $child2 = $this->createStub(Individual::class);
         $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = $this->createMock(Individual::class);
+        $child3 = $this->createStub(Individual::class);
         $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = $this->createMock(Individual::class);
+        $child4 = $this->createStub(Individual::class);
         $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child4->method('getDeathDate')->willReturn(new Date(''));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('children')->willReturn(new Collection([$child1, $child2, $child3, $child4]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 773e9b3cf1..4cb0220214 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -32,11 +32,11 @@ class CensusColumnChildrenLivingTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnChildrenLiving($census, '', '');
 
@@ -46,26 +46,26 @@ class CensusColumnChildrenLivingTest extends TestCase
     public function testCountChildren(): void
     {
         // Stillborn
-        $child1 = $this->createMock(Individual::class);
+        $child1 = $this->createStub(Individual::class);
         $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904'));
 
         // Died after census
-        $child2 = $this->createMock(Individual::class);
+        $child2 = $this->createStub(Individual::class);
         $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912'));
 
         // Died before census
-        $child3 = $this->createMock(Individual::class);
+        $child3 = $this->createStub(Individual::class);
         $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904'));
         $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910'));
 
         // Still living
-        $child4 = $this->createMock(Individual::class);
+        $child4 = $this->createStub(Individual::class);
         $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904'));
         $child4->method('getDeathDate')->willReturn(new Date(''));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('children')->willReturn(new Collection([
             $child1,
             $child2,
@@ -73,11 +73,11 @@ class CensusColumnChildrenLivingTest extends TestCase
             $child4,
         ]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 c3bfce80ed..49ff3adfae 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedSingle($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 66382401e9..572b7768aa 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 6e2d462401..dd319beed8 100644
--- a/tests/app/Census/CensusColumnConditionCanadaTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionCanadaTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionCanadaTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionCanadaTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanada($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanada($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionCanadaTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 4f4e5c57f6..522ff3318e 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedFemale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 510fd5c90d..38eedaad31 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowedMale($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 3b1a6325ab..1e799117f3 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionCanadaWidowed($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 f98e44bcfa..c4279bddec 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionDanishTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionDanishTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionDanishTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionDanish($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionDanishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionDanishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 a45f0ce59a..2c8bcfef7d 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionEnglishTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionEnglishTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionEnglishTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionEnglish($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionEnglishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionEnglishTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 f6a66618c9..304f621e4b 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 4ee85a8dbd..554ada6c97 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 b9f21a2883..e783d6c8a8 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 55cb177983..af89c4331e 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 2b229351d1..365161588d 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,14 +131,14 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -147,11 +147,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -161,16 +161,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -180,16 +180,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -199,16 +199,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -218,16 +218,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
@@ -237,11 +237,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -249,11 +249,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -263,11 +263,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -275,11 +275,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 6737eb17ec..28b9d21cd7 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,15 +101,15 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -118,11 +118,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -132,15 +132,15 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -149,11 +149,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -163,16 +163,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -182,16 +182,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -201,16 +201,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -220,16 +220,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
@@ -239,12 +239,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -252,11 +252,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -266,12 +266,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
@@ -279,11 +279,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 95f123fe99..fca7b5578d 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -33,12 +33,12 @@ class CensusColumnConditionUsTest extends TestCase
 {
     public function testNoSpouseFamiliesMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -48,12 +48,12 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoSpouseFamiliesFemale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection());
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -63,16 +63,16 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -82,16 +82,16 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -101,14 +101,14 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testSpouseDeadMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::exactly(2))
+        $family->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -117,11 +117,11 @@ class CensusColumnConditionUsTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -131,15 +131,15 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testSpouseDeadFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -148,11 +148,11 @@ class CensusColumnConditionUsTest extends TestCase
             );
         $family->expects($this->once())->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -162,16 +162,16 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -181,16 +181,16 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -200,16 +200,16 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -219,16 +219,16 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
         $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1830');
 
         $column = new CensusColumnConditionUs($census, '', '');
@@ -238,12 +238,12 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testDivorcedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -251,11 +251,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -265,12 +265,12 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testDivorcedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -278,11 +278,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection([$fact])
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -292,12 +292,12 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testMarriedMale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -305,11 +305,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnConditionUs($census, '', '');
         $census->method('censusDate')->willReturn('30 JUN 1830');
@@ -319,12 +319,12 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testMarriedFemale(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
 
         $family = $this->createMock(Family::class);
         $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date(''));
         $family
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
@@ -332,11 +332,11 @@ class CensusColumnConditionUsTest extends TestCase
                 new Collection()
             );
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 7b80441927..5f0de7b10e 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
@@ -34,7 +34,7 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -43,16 +43,16 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase
 
     public function testKnownStateAndTown(): void
     {
-        $father = $this->createMock(Individual::class);
+        $father = $this->createStub(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 cb5e48876e..4179833f6d 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
@@ -34,7 +34,7 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -43,16 +43,16 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
 
     public function testSameCountry(): void
     {
-        $father = $this->createMock(Individual::class);
+        $father = $this->createStub(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -62,16 +62,16 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
 
     public function testDifferentCountry(): void
     {
-        $father = $this->createMock(Individual::class);
+        $father = $this->createStub(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -81,13 +81,13 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
 
     public function testPlaceNoParent(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn(null);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -97,10 +97,10 @@ class CensusColumnFatherBirthPlaceTest extends TestCase
 
     public function testPlaceNoParentFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 10c49bab26..d2f2b0e410 100644
--- a/tests/app/Census/CensusColumnFatherForeignTest.php
+++ b/tests/app/Census/CensusColumnFatherForeignTest.php
@@ -32,7 +32,7 @@ class CensusColumnFatherForeignTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -40,16 +40,16 @@ class CensusColumnFatherForeignTest extends TestCase
 
     public function testSameCountry(): void
     {
-        $father = $this->createMock(Individual::class);
+        $father = $this->createStub(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -59,16 +59,16 @@ class CensusColumnFatherForeignTest extends TestCase
 
     public function testDifferentCountry(): void
     {
-        $father = $this->createMock(Individual::class);
+        $father = $this->createStub(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn($father);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -78,13 +78,13 @@ class CensusColumnFatherForeignTest extends TestCase
 
     public function testPlaceNoParent(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('husband')->willReturn(null);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
@@ -94,10 +94,10 @@ class CensusColumnFatherForeignTest extends TestCase
 
     public function testPlaceNoParentFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnFatherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index 5009bfb66a..2dd11a96c5 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -33,11 +33,11 @@ class CensusColumnFullNameTest extends TestCase
 {
     public function xxxtestFullName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([['full' => 'Joe Bloggs']]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnFullName($census, '', '');
@@ -58,22 +58,22 @@ class CensusColumnFullNameTest extends TestCase
 
         $marriage_date = new Date('02 DATE 2019');
 
-        $marriage = $this->createMock(Fact::class);
+        $marriage = $this->createStub(Fact::class);
         $marriage->method('date')->willReturn($marriage_date);
 
-        $spouse = $this->createMock(Individual::class);
+        $spouse = $this->createStub(Individual::class);
         $spouse->method('getAllNames')->willReturn($husband_names);
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->willReturn(new Collection([$marriage]));
         $family->method('getMarriageDate')->willReturn($marriage_date);
         $family->method('spouse')->willReturn($spouse);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn($wife_names);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JAN 2020');
 
         $column = new CensusColumnFullName($census, '', '');
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index 37a66211e9..348dcf03a9 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -29,10 +29,10 @@ class CensusColumnGivenNameInitialTest extends TestCase
 {
     public function testOneGivenName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([['givn' => 'Joe']]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnGivenNameInitialTest extends TestCase
 
     public function testMultipleGivenNames(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([['givn' => 'Joe Fred']]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnGivenNameInitialTest extends TestCase
 
     public function testNoName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index 0501c8fb58..0a0ce39654 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -29,10 +29,10 @@ class CensusColumnGivenNamesTest extends TestCase
 {
     public function testGivenNames(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([['givn' => 'Joe']]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnGivenNames($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnGivenNamesTest extends TestCase
 
     public function testNoName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnGivenNames($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 21f05de34a..1213d948a7 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -33,16 +33,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 {
     public function testMarriedWithinYear(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -52,16 +52,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 
     public function testMarriedOverYearBeforeTheCensus(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -71,16 +71,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 
     public function testMarriedAfterTheCensus(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -90,13 +90,13 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -106,10 +106,10 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 
     public function testNoSpouseFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 d11280140c..708ead4450 100644
--- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
@@ -30,10 +30,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
 {
     public function testBornWithinYear(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('01 JAN 1860'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -43,10 +43,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
 
     public function testBornOverYearBeforeTheCensus(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('01 JAN 1859'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -56,10 +56,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
 
     public function testBornAfterTheCensus(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date('02 JUN 1860'));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -69,10 +69,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase
 
     public function testNoBirth(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthDate')->willReturn(new Date(''));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 e587ca7531..be09c851d5 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -33,16 +33,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 {
     public function testMarriedWithinYear(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -52,16 +52,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 
     public function testMarriedOverYearBeforeTheCensus(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -71,16 +71,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 
     public function testMarriedAfterTheCensus(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -90,13 +90,13 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -106,10 +106,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 
     public function testNoSpouseFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 df7a947635..e38dd601d0 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
@@ -34,7 +34,7 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -43,16 +43,16 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase
 
     public function testKnownStateAndTown(): void
     {
-        $father = $this->createMock(Individual::class);
+        $father = $this->createStub(Individual::class);
         $father->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn($father);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 2738b1570a..3acdda1775 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
@@ -34,7 +34,7 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
     {
         $placeParts = explode(', ', $place);
 
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
         $placeMock->method('lastParts')->willReturn(new Collection($placeParts));
 
@@ -43,16 +43,16 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
 
     public function testSameCountry(): void
     {
-        $mother = $this->createMock(Individual::class);
+        $mother = $this->createStub(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -62,16 +62,16 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
 
     public function testDifferentCountry(): void
     {
-        $mother = $this->createMock(Individual::class);
+        $mother = $this->createStub(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -81,13 +81,13 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
 
     public function testPlaceNoParent(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn(null);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -97,10 +97,10 @@ class CensusColumnMotherBirthPlaceTest extends TestCase
 
     public function testPlaceNoParentFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 1f6eac0938..c6afac0f00 100644
--- a/tests/app/Census/CensusColumnMotherForeignTest.php
+++ b/tests/app/Census/CensusColumnMotherForeignTest.php
@@ -32,7 +32,7 @@ class CensusColumnMotherForeignTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -40,16 +40,16 @@ class CensusColumnMotherForeignTest extends TestCase
 
     public function testSameCountry(): void
     {
-        $mother = $this->createMock(Individual::class);
+        $mother = $this->createStub(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -59,16 +59,16 @@ class CensusColumnMotherForeignTest extends TestCase
 
     public function testDifferentCountry(): void
     {
-        $mother = $this->createMock(Individual::class);
+        $mother = $this->createStub(Individual::class);
         $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn($mother);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Ireland');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -78,13 +78,13 @@ class CensusColumnMotherForeignTest extends TestCase
 
     public function testPlaceNoParent(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('wife')->willReturn(null);
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnMotherForeign($census, '', '');
@@ -94,10 +94,10 @@ class CensusColumnMotherForeignTest extends TestCase
 
     public function testPlaceNoParentFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('childFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 8520e4d13b..ae2e6212a3 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -33,7 +33,7 @@ class CensusColumnNationalityTest extends TestCase
 {
     private function getPlaceMock(string $place): Place
     {
-        $placeMock = $this->createMock(Place::class);
+        $placeMock = $this->createStub(Place::class);
         $placeMock->method('gedcomName')->willReturn($place);
 
         return $placeMock;
@@ -41,11 +41,11 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testNoBirthPlace(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('Deutschland');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -55,11 +55,11 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testPlaceCountry(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Australia'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -69,11 +69,11 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testBritish(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusPlace')->willReturn('England');
 
         $column = new CensusColumnNationality($census, '', '');
@@ -83,28 +83,28 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testEmigrated(): void
     {
-        $place1 = $this->createMock(Place::class);
+        $place1 = $this->createStub(Place::class);
         $place1->method('gedcomName')->willReturn('United States');
 
-        $fact1 = $this->createMock(Fact::class);
+        $fact1 = $this->createStub(Fact::class);
         $fact1->method('place')->willReturn($place1);
         $fact1->method('date')->willReturn(new Date('1855'));
 
-        $place2 = $this->createMock(Place::class);
+        $place2 = $this->createStub(Place::class);
         $place2->method('gedcomName')->willReturn('Australia');
 
-        $fact2 = $this->createMock(Fact::class);
+        $fact2 = $this->createStub(Fact::class);
         $fact2->method('place')->willReturn($place2);
         $fact2->method('date')->willReturn(new Date('1865'));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection([
             $fact1,
             $fact2,
         ]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 e29a3255cc..3322b7dcc8 100644
--- a/tests/app/Census/CensusColumnNullTest.php
+++ b/tests/app/Census/CensusColumnNullTest.php
@@ -29,9 +29,9 @@ class CensusColumnNullTest extends TestCase
 {
     public function testNull(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnNull($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 6271b6b5d2..f9077535f9 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -31,10 +31,10 @@ class CensusColumnOccupationTest extends TestCase
 {
     public function testNoOccupation(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnOccupation($census, '', '');
 
@@ -43,13 +43,13 @@ class CensusColumnOccupationTest extends TestCase
 
     public function testOccupation(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('value')->willReturn('Farmer');
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection([$fact]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnOccupation($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
index fc59e14f86..616b5ce4cc 100644
--- a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php
@@ -30,9 +30,9 @@ class CensusColumnRelationToHeadEnglishTest extends TestCase
 {
     public function testNull(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnRelationToHeadEnglish($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
index f99fbe3a4a..f16ecab5d7 100644
--- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
@@ -30,9 +30,9 @@ class CensusColumnRelationToHeadGermanTest extends TestCase
 {
     public function testNull(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnRelationToHeadGerman($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php
index 958e735919..28bc219121 100644
--- a/tests/app/Census/CensusColumnRelationToHeadTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadTest.php
@@ -32,15 +32,15 @@ class CensusColumnRelationToHeadTest extends TestCase
 
     public function testNull(): void
     {
-        $individual1 = $this->createMock(Individual::class);
-        $individual2 = $this->createMock(Individual::class);
+        $individual1 = $this->createStub(Individual::class);
+        $individual2 = $this->createStub(Individual::class);
 
         $individual1->method('childFamilies')->willReturn(new Collection());
         $individual1->method('spouseFamilies')->willReturn(new Collection());
         $individual2->method('childFamilies')->willReturn(new Collection());
         $individual2->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnRelationToHead($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index c9158adb28..61f50f04b6 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -33,12 +33,12 @@ class CensusColumnReligionTest extends TestCase
     {
         $individual = $this->createMock(Individual::class);
         $individual
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['RELI'], []]))
             ->willReturnOnConsecutiveCalls(new Collection(), new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnReligion($census, '', '');
 
@@ -47,12 +47,12 @@ class CensusColumnReligionTest extends TestCase
 
     public function testRecordReligion(): void
     {
-        $individual = $this->createMock(Individual::class);
-        $fact       = $this->createMock(Fact::class);
+        $individual = $this->createStub(Individual::class);
+        $fact       = $this->createStub(Fact::class);
         $fact->method('value')->willReturn('Jedi');
         $individual->method('facts')->with(['RELI'])->willReturn(new Collection([$fact]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnReligion($census, '', '');
 
@@ -62,10 +62,10 @@ class CensusColumnReligionTest extends TestCase
     public function testEventReligion(): void
     {
         $individual = $this->createMock(Individual::class);
-        $fact       = $this->createMock(Fact::class);
+        $fact       = $this->createStub(Fact::class);
         $fact->method('attribute')->with('RELI')->willReturn('Jedi');
         $individual
-            ->expects(self::exactly(2))
+            ->expects($this->exactly(2))
             ->method('facts')
             ->with(self::withConsecutive([['RELI'], []]))
             ->willReturnOnConsecutiveCalls(
@@ -73,7 +73,7 @@ class CensusColumnReligionTest extends TestCase
                 new Collection([$fact])
             );
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnReligion($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexFTest.php b/tests/app/Census/CensusColumnSexFTest.php
index cb85972ea7..a415d7b5ac 100644
--- a/tests/app/Census/CensusColumnSexFTest.php
+++ b/tests/app/Census/CensusColumnSexFTest.php
@@ -29,10 +29,10 @@ class CensusColumnSexFTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexF($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnSexFTest extends TestCase
 
     public function testFeale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexF($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexFTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexF($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php
index df0c782998..a55987e743 100644
--- a/tests/app/Census/CensusColumnSexMFTest.php
+++ b/tests/app/Census/CensusColumnSexMFTest.php
@@ -29,10 +29,10 @@ class CensusColumnSexMFTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnSexMFTest extends TestCase
 
     public function testFeale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMFTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMF($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
index 5a1d2f3125..2c478990c8 100644
--- a/tests/app/Census/CensusColumnSexMKTest.php
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -29,10 +29,10 @@ class CensusColumnSexMKTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnSexMKTest extends TestCase
 
     public function testFeale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMKTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMK($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMTest.php b/tests/app/Census/CensusColumnSexMTest.php
index 8ca6664768..262d8b71f6 100644
--- a/tests/app/Census/CensusColumnSexMTest.php
+++ b/tests/app/Census/CensusColumnSexMTest.php
@@ -29,10 +29,10 @@ class CensusColumnSexMTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexM($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnSexMTest extends TestCase
 
     public function testFeale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexM($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexM($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php
index 14305d6f66..c649ccc668 100644
--- a/tests/app/Census/CensusColumnSexMZTest.php
+++ b/tests/app/Census/CensusColumnSexMZTest.php
@@ -29,10 +29,10 @@ class CensusColumnSexMZTest extends TestCase
 {
     public function testMale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('M');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnSexMZTest extends TestCase
 
     public function testFeale(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('F');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
@@ -53,10 +53,10 @@ class CensusColumnSexMZTest extends TestCase
 
     public function testUnknownSex(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('sex')->willReturn('U');
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSexMZ($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index 240189fdc4..189fa44f2d 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -30,7 +30,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
 {
     public function testOneGivenName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn' => 'Joe',
@@ -39,7 +39,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
@@ -49,7 +49,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
 
     public function testMultipleGivenNames(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn' => 'Joe Fred',
@@ -58,7 +58,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 38f2ffb1c9..b231d7080e 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
@@ -30,7 +30,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
 {
     public function testOneGivenName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn' => 'Joe',
@@ -39,7 +39,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
@@ -49,7 +49,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
 
     public function testMultipleGivenNames(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn'    => 'Joe Fred',
@@ -58,7 +58,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
@@ -68,7 +68,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
 
     public function testNoName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([
             [
                 'givn'    => Individual::PRAENOMEN_NESCIO,
@@ -77,7 +77,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase
         ]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(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 468f4f6187..baa2ca1848 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -29,10 +29,10 @@ class CensusColumnSurnameTest extends TestCase
 {
     public function testSurname(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([['surname' => 'Bloggs']]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSurname($census, '', '');
 
@@ -41,10 +41,10 @@ class CensusColumnSurnameTest extends TestCase
 
     public function testNoName(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([]);
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
 
         $column = new CensusColumnSurname($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index ecfd859015..6132ff58b7 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -33,10 +33,10 @@ class CensusColumnYearsMarriedTest extends TestCase
 {
     public function testNoSpouseFamily(): void
     {
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -46,13 +46,13 @@ class CensusColumnYearsMarriedTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection());
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -62,16 +62,16 @@ class CensusColumnYearsMarriedTest extends TestCase
 
     public function testUndatedMarriage(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date(''));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -81,16 +81,16 @@ class CensusColumnYearsMarriedTest extends TestCase
 
     public function testMarriageAfterCensus(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('1861'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');
@@ -100,16 +100,16 @@ class CensusColumnYearsMarriedTest extends TestCase
 
     public function testMarriageBeforeCensus(): void
     {
-        $fact = $this->createMock(Fact::class);
+        $fact = $this->createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('OCT 1851'));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
 
-        $census = $this->createMock(CensusInterface::class);
+        $census = $this->createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('01 JUN 1860');
 
         $column = new CensusColumnYearsMarried($census, '', '');