Tests

10 files changed, 414 insertions, 142 deletions

diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 46e8137750..6545b459d7 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionDanishTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionDanishTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionDanishTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionDanishTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 0af478b4e1..9629fea44f 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionEnglishTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionEnglishTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionEnglishTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionEnglishTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 1307b3fb82..84f748ce30 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 5086492bc8..acf0d2f004 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index ad2fbee982..5d6d3eacb3 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index 996e2961fc..cdad41c9ab 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 5ebaf1eb75..dd9b5e741b 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -137,10 +137,18 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +176,18 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +346,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 3d93fd5a8a..5325e4a638 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -137,10 +137,19 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +177,19 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +314,17 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +349,17 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturn(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 833a8f0ad1..f78723d384 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -137,10 +137,17 @@ class CensusColumnConditionUsTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']])
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -168,10 +175,19 @@ class CensusColumnConditionUsTest extends TestCase
         $spouse->method('getDeathDate')->willReturn(new Date('1820'));
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection());
-        $family->expects(self::at(3))->method('spouse')->willReturn($spouse);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
@@ -296,9 +312,17 @@ class CensusColumnConditionUsTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('M');
@@ -323,9 +347,17 @@ class CensusColumnConditionUsTest extends TestCase
         $fact = self::createMock(Fact::class);
 
         $family = self::createMock(Family::class);
-        $family->expects(self::at(0))->method('getMarriageDate')->willReturn(new Date(''));
-        $family->expects(self::at(1))->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
-        $family->expects(self::at(2))->method('facts')->with(['DIV'])->willReturn(new Collection([$fact]));
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
 
         $individual = self::createMock(Individual::class);
         $individual->method('sex')->willReturn('F');
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 8976dfc24c..74e08e8db8 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -38,15 +38,10 @@ class CensusColumnReligionTest extends TestCase
     {
         $individual = self::createMock(Individual::class);
         $individual
-            ->expects(self::at(0))
+            ->expects(self::exactly(2))
             ->method('facts')
-            ->with(['RELI'])
-            ->willReturn(new Collection());
-        $individual
-            ->expects(self::at(1))
-            ->method('facts')
-            ->with()
-            ->willReturn(new Collection());
+            ->withConsecutive([['RELI']], [])
+            ->willReturnOnConsecutiveCalls(new Collection(), new Collection());
 
         $census = self::createMock(CensusInterface::class);
 
@@ -85,15 +80,16 @@ class CensusColumnReligionTest extends TestCase
         $fact       = self::createMock(Fact::class);
         $fact->method('attribute')->with('RELI')->willReturn('Jedi');
         $individual
-            ->expects(self::at(0))
-            ->method('facts')
-            ->with(['RELI'])
-            ->willReturn(new Collection());
-        $individual
-            ->expects(self::at(1))
+            ->expects(self::exactly(2))
             ->method('facts')
-            ->with()
-            ->willReturn(new Collection([$fact]));
+            ->withConsecutive(
+                [['RELI']],
+                []
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection(),
+                new Collection([$fact])
+            );
 
         $census = self::createMock(CensusInterface::class);