Prefer class-constants to global-constants

15 files changed, 146 insertions, 146 deletions

diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 2eaad0d2a4..3217b4d20e 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -47,7 +47,7 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR', true)->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840'));
@@ -90,7 +90,7 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase
     public function testNoMarriage()
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getBirthDate')->andReturn(new Date(''));
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 57b7978579..1772ede313 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 598ea904e6..4a689eea4a 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 5ba9e16f4f..32ddfed735 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 36f76206e7..c4bbcef4fa 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index 2ad6f5acfa..8b6d578810 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index 717ebbe266..56067fdf51 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 11c0c0b774..85c14274d7 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 5bb94e1905..666f97725c 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index d8b302173c..72c10a3fbe 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -87,7 +87,7 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -112,7 +112,7 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -142,8 +142,8 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -173,8 +173,8 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([]);
         $family->shouldReceive('getSpouse')->andReturn($spouse);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
@@ -199,7 +199,7 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -224,7 +224,7 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -249,7 +249,7 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -274,7 +274,7 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
@@ -301,8 +301,8 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('M');
@@ -328,8 +328,8 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
         $family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
-        $family->shouldReceive('facts')->with('DIV')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSex')->andReturn('F');
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index edcb7d2694..938d14f967 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -47,7 +47,7 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -72,7 +72,7 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -97,7 +97,7 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -119,7 +119,7 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase
     public function testNoMarriage()
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index 2b3d610b81..267443e26d 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -47,7 +47,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
         $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -72,7 +72,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
         $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -97,7 +97,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
         $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -119,7 +119,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes
     public function testNoMarriage()
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR')->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'])->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 1546f8be1f..9e4c3fd692 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -61,7 +61,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
     {
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock(''));
-        $individual->shouldReceive('facts')->with('IMMI|EMIG|NATU', true)->andReturn([]);
+        $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]);
 
         $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
         $census->shouldReceive('censusPlace')->andReturn('Deutschland');
@@ -81,7 +81,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
     {
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Australia'));
-        $individual->shouldReceive('facts')->with('IMMI|EMIG|NATU', true)->andReturn([]);
+        $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]);
 
         $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
         $census->shouldReceive('censusPlace')->andReturn('England');
@@ -101,7 +101,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
     {
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
-        $individual->shouldReceive('facts')->with('IMMI|EMIG|NATU', true)->andReturn([]);
+        $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]);
 
         $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
         $census->shouldReceive('censusPlace')->andReturn('England');
@@ -135,7 +135,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England'));
-        $individual->shouldReceive('facts')->with('IMMI|EMIG|NATU', true)->andReturn([
+        $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([
             $fact1,
             $fact2,
         ]);
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index c889e3d250..7fb2f94bd7 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -43,7 +43,7 @@ class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase
     public function testNoOccupation()
     {
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-        $individual->shouldReceive('facts')->withArgs(['OCCU'])->andReturn([]);
+        $individual->shouldReceive('facts')->with(['OCCU'])->andReturn([]);
 
         $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
@@ -64,7 +64,7 @@ class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('value')->andReturn('Farmer');
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
-        $individual->shouldReceive('facts')->withArgs(['OCCU'])->andReturn([$fact]);
+        $individual->shouldReceive('facts')->with(['OCCU'])->andReturn([$fact]);
 
         $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index 7fadbcf10e..add89696c9 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -63,7 +63,7 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
     public function testNoMarriage()
     {
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR', true)->andReturn([]);
+        $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -88,7 +88,7 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date(''));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR', true)->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -113,7 +113,7 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date('1861'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR', true)->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);
@@ -138,7 +138,7 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase
         $fact->shouldReceive('date')->andReturn(new Date('OCT 1851'));
 
         $family = Mockery::mock('Fisharebest\Webtrees\Family');
-        $family->shouldReceive('facts')->with('MARR', true)->andReturn([$fact]);
+        $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]);
 
         $individual = Mockery::mock('Fisharebest\Webtrees\Individual');
         $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]);