CodeStyle - type mismatch

99 files changed, 291 insertions, 291 deletions

diff --git a/app/Census/AbstractCensusColumnCondition.php b/app/Census/AbstractCensusColumnCondition.php
index bad1d8a74f..289f923917 100644
--- a/app/Census/AbstractCensusColumnCondition.php
+++ b/app/Census/AbstractCensusColumnCondition.php
@@ -65,7 +65,7 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $family = $this->spouseFamily($individual);
         $sex    = $individual->getSex();
diff --git a/app/Census/CensusColumnAge.php b/app/Census/CensusColumnAge.php
index 1e01485a1c..68d5378757 100644
--- a/app/Census/CensusColumnAge.php
+++ b/app/Census/CensusColumnAge.php
@@ -32,7 +32,7 @@ class CensusColumnAge extends AbstractCensusColumn implements CensusColumnInterf
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
diff --git a/app/Census/CensusColumnAgeFemale.php b/app/Census/CensusColumnAgeFemale.php
index fd538dc497..1cd20b50cb 100644
--- a/app/Census/CensusColumnAgeFemale.php
+++ b/app/Census/CensusColumnAgeFemale.php
@@ -32,7 +32,7 @@ class CensusColumnAgeFemale extends AbstractCensusColumn implements CensusColumn
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() === 'M') {
             return '';
diff --git a/app/Census/CensusColumnAgeFemale5Years.php b/app/Census/CensusColumnAgeFemale5Years.php
index f133a9cbab..16a51a09e4 100644
--- a/app/Census/CensusColumnAgeFemale5Years.php
+++ b/app/Census/CensusColumnAgeFemale5Years.php
@@ -32,7 +32,7 @@ class CensusColumnAgeFemale5Years extends AbstractCensusColumn implements Census
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() === 'M') {
             return '';
diff --git a/app/Census/CensusColumnAgeMale.php b/app/Census/CensusColumnAgeMale.php
index e836be4a03..83b28ea5e5 100644
--- a/app/Census/CensusColumnAgeMale.php
+++ b/app/Census/CensusColumnAgeMale.php
@@ -32,7 +32,7 @@ class CensusColumnAgeMale extends AbstractCensusColumn implements CensusColumnIn
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() === 'F') {
             return '';
diff --git a/app/Census/CensusColumnAgeMale5Years.php b/app/Census/CensusColumnAgeMale5Years.php
index 59f7f875e5..538246a9e2 100644
--- a/app/Census/CensusColumnAgeMale5Years.php
+++ b/app/Census/CensusColumnAgeMale5Years.php
@@ -32,7 +32,7 @@ class CensusColumnAgeMale5Years extends AbstractCensusColumn implements CensusCo
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() === 'F') {
             return '';
diff --git a/app/Census/CensusColumnAgeMarried.php b/app/Census/CensusColumnAgeMarried.php
index 452af7ffab..6423b9aa9e 100644
--- a/app/Census/CensusColumnAgeMarried.php
+++ b/app/Census/CensusColumnAgeMarried.php
@@ -32,7 +32,7 @@ class CensusColumnAgeMarried extends AbstractCensusColumn implements CensusColum
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getBirthDate()->isOK()) {
             foreach ($individual->getSpouseFamilies() as $family) {
diff --git a/app/Census/CensusColumnBirthDate.php b/app/Census/CensusColumnBirthDate.php
index c5cf1e7b13..aa89a535ce 100644
--- a/app/Census/CensusColumnBirthDate.php
+++ b/app/Census/CensusColumnBirthDate.php
@@ -31,7 +31,7 @@ class CensusColumnBirthDate extends AbstractCensusColumn implements CensusColumn
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $individual->getEstimatedBirthDate()->minimumDate()->format('%j %n %Y');
     }
diff --git a/app/Census/CensusColumnBirthDay.php b/app/Census/CensusColumnBirthDay.php
index 7fc31ca4fe..47c9eaf6a6 100644
--- a/app/Census/CensusColumnBirthDay.php
+++ b/app/Census/CensusColumnBirthDay.php
@@ -31,7 +31,7 @@ class CensusColumnBirthDay extends AbstractCensusColumn implements CensusColumnI
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $individual->getEstimatedBirthDate()->minimumDate()->format('%j');
     }
diff --git a/app/Census/CensusColumnBirthDayDotMonthYear.php b/app/Census/CensusColumnBirthDayDotMonthYear.php
index 70987ea6f3..5deca398f0 100644
--- a/app/Census/CensusColumnBirthDayDotMonthYear.php
+++ b/app/Census/CensusColumnBirthDayDotMonthYear.php
@@ -31,7 +31,7 @@ class CensusColumnBirthDayDotMonthYear extends AbstractCensusColumn implements C
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_date = $individual->getBirthDate();
 
diff --git a/app/Census/CensusColumnBirthDayMonthSlashYear.php b/app/Census/CensusColumnBirthDayMonthSlashYear.php
index efbf8952ca..02f0b237e6 100644
--- a/app/Census/CensusColumnBirthDayMonthSlashYear.php
+++ b/app/Census/CensusColumnBirthDayMonthSlashYear.php
@@ -31,7 +31,7 @@ class CensusColumnBirthDayMonthSlashYear extends AbstractCensusColumn implements
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_date = $individual->getBirthDate();
 
diff --git a/app/Census/CensusColumnBirthDaySlashMonth.php b/app/Census/CensusColumnBirthDaySlashMonth.php
index 4128c3e41a..2ff84299b6 100644
--- a/app/Census/CensusColumnBirthDaySlashMonth.php
+++ b/app/Census/CensusColumnBirthDaySlashMonth.php
@@ -31,7 +31,7 @@ class CensusColumnBirthDaySlashMonth extends AbstractCensusColumn implements Cen
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_date = $individual->getBirthDate();
 
diff --git a/app/Census/CensusColumnBirthDaySlashMonthYear.php b/app/Census/CensusColumnBirthDaySlashMonthYear.php
index 84c1e6ca15..98d299341f 100644
--- a/app/Census/CensusColumnBirthDaySlashMonthYear.php
+++ b/app/Census/CensusColumnBirthDaySlashMonthYear.php
@@ -31,7 +31,7 @@ class CensusColumnBirthDaySlashMonthYear extends AbstractCensusColumn implements
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_date = $individual->getBirthDate();
 
diff --git a/app/Census/CensusColumnBirthMonth.php b/app/Census/CensusColumnBirthMonth.php
index 3ff874a67a..e8a912e85a 100644
--- a/app/Census/CensusColumnBirthMonth.php
+++ b/app/Census/CensusColumnBirthMonth.php
@@ -31,7 +31,7 @@ class CensusColumnBirthMonth extends AbstractCensusColumn implements CensusColum
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $individual->getEstimatedBirthDate()->minimumDate()->format('%M');
     }
diff --git a/app/Census/CensusColumnBirthPlace.php b/app/Census/CensusColumnBirthPlace.php
index e567cca610..df57cf5219 100644
--- a/app/Census/CensusColumnBirthPlace.php
+++ b/app/Census/CensusColumnBirthPlace.php
@@ -31,7 +31,7 @@ class CensusColumnBirthPlace extends AbstractCensusColumn implements CensusColum
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_place  = $individual->getBirthPlace()->getGedcomName();
         $census_place = $this->place();
diff --git a/app/Census/CensusColumnBirthPlaceSimple.php b/app/Census/CensusColumnBirthPlaceSimple.php
index 072dffdc53..c020806563 100644
--- a/app/Census/CensusColumnBirthPlaceSimple.php
+++ b/app/Census/CensusColumnBirthPlaceSimple.php
@@ -31,7 +31,7 @@ class CensusColumnBirthPlaceSimple extends CensusColumnBirthPlace implements Cen
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $this->lastPartOfPlace(parent::generate($individual, $head));
     }
diff --git a/app/Census/CensusColumnBirthYear.php b/app/Census/CensusColumnBirthYear.php
index 39c8be17f3..564beba8b0 100644
--- a/app/Census/CensusColumnBirthYear.php
+++ b/app/Census/CensusColumnBirthYear.php
@@ -31,7 +31,7 @@ class CensusColumnBirthYear extends AbstractCensusColumn implements CensusColumn
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $individual->getEstimatedBirthDate()->minimumDate()->format('%Y');
     }
diff --git a/app/Census/CensusColumnBornForeignParts.php b/app/Census/CensusColumnBornForeignParts.php
index f541b64ec8..7d4bb2dd00 100644
--- a/app/Census/CensusColumnBornForeignParts.php
+++ b/app/Census/CensusColumnBornForeignParts.php
@@ -31,7 +31,7 @@ class CensusColumnBornForeignParts extends AbstractCensusColumn implements Censu
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_place  = $individual->getBirthPlace()->lastPart();
         $census_place = $this->place();
diff --git a/app/Census/CensusColumnChildrenBornAlive.php b/app/Census/CensusColumnChildrenBornAlive.php
index 7e1b3bd684..e726cca04a 100644
--- a/app/Census/CensusColumnChildrenBornAlive.php
+++ b/app/Census/CensusColumnChildrenBornAlive.php
@@ -32,7 +32,7 @@ class CensusColumnChildrenBornAlive extends AbstractCensusColumn implements Cens
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() !== 'F') {
             return '';
diff --git a/app/Census/CensusColumnChildrenDied.php b/app/Census/CensusColumnChildrenDied.php
index 2c749e24d6..cd3fa2707c 100644
--- a/app/Census/CensusColumnChildrenDied.php
+++ b/app/Census/CensusColumnChildrenDied.php
@@ -32,7 +32,7 @@ class CensusColumnChildrenDied extends AbstractCensusColumn implements CensusCol
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() !== 'F') {
             return '';
diff --git a/app/Census/CensusColumnChildrenLiving.php b/app/Census/CensusColumnChildrenLiving.php
index 7f65c2d33d..c07952e3de 100644
--- a/app/Census/CensusColumnChildrenLiving.php
+++ b/app/Census/CensusColumnChildrenLiving.php
@@ -32,7 +32,7 @@ class CensusColumnChildrenLiving extends AbstractCensusColumn implements CensusC
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($individual->getSex() !== 'F') {
             return '';
diff --git a/app/Census/CensusColumnFatherBirthPlace.php b/app/Census/CensusColumnFatherBirthPlace.php
index d24190d74f..a250f56e8a 100644
--- a/app/Census/CensusColumnFatherBirthPlace.php
+++ b/app/Census/CensusColumnFatherBirthPlace.php
@@ -31,7 +31,7 @@ class CensusColumnFatherBirthPlace extends AbstractCensusColumn implements Censu
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $father = $this->father($individual);
 
diff --git a/app/Census/CensusColumnFatherBirthPlaceSimple.php b/app/Census/CensusColumnFatherBirthPlaceSimple.php
index 8ccdc73213..865f9129ca 100644
--- a/app/Census/CensusColumnFatherBirthPlaceSimple.php
+++ b/app/Census/CensusColumnFatherBirthPlaceSimple.php
@@ -31,7 +31,7 @@ class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace im
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $this->lastPartOfPlace(parent::generate($individual, $head));
     }
diff --git a/app/Census/CensusColumnFatherForeign.php b/app/Census/CensusColumnFatherForeign.php
index 739b794c67..a11565e3a4 100644
--- a/app/Census/CensusColumnFatherForeign.php
+++ b/app/Census/CensusColumnFatherForeign.php
@@ -31,7 +31,7 @@ class CensusColumnFatherForeign extends AbstractCensusColumn implements CensusCo
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $father = $this->father($individual);
 
diff --git a/app/Census/CensusColumnFullName.php b/app/Census/CensusColumnFullName.php
index 88c207da89..eeef050987 100644
--- a/app/Census/CensusColumnFullName.php
+++ b/app/Census/CensusColumnFullName.php
@@ -32,7 +32,7 @@ class CensusColumnFullName extends AbstractCensusColumn implements CensusColumnI
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $name = $this->nameAtCensusDate($individual, $this->date());
 
diff --git a/app/Census/CensusColumnGivenNameInitial.php b/app/Census/CensusColumnGivenNameInitial.php
index 0f8603eca6..be0bb454c1 100644
--- a/app/Census/CensusColumnGivenNameInitial.php
+++ b/app/Census/CensusColumnGivenNameInitial.php
@@ -31,7 +31,7 @@ class CensusColumnGivenNameInitial extends AbstractCensusColumn implements Censu
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getAllNames() as $name) {
             $given = $name['givn'];
diff --git a/app/Census/CensusColumnGivenNames.php b/app/Census/CensusColumnGivenNames.php
index cd32dd1818..2434c61619 100644
--- a/app/Census/CensusColumnGivenNames.php
+++ b/app/Census/CensusColumnGivenNames.php
@@ -31,7 +31,7 @@ class CensusColumnGivenNames extends AbstractCensusColumn implements CensusColum
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getAllNames() as $name) {
             return $name['givn'];
diff --git a/app/Census/CensusColumnInterface.php b/app/Census/CensusColumnInterface.php
index 089561a225..34a93a4a9e 100644
--- a/app/Census/CensusColumnInterface.php
+++ b/app/Census/CensusColumnInterface.php
@@ -46,7 +46,7 @@ interface CensusColumnInterface
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null);
+    public function generate(Individual $individual, Individual $head);
 
     /**
      * Where did this census occur
diff --git a/app/Census/CensusColumnMarriedWithinYear.php b/app/Census/CensusColumnMarriedWithinYear.php
index 2089867833..a49c562cb9 100644
--- a/app/Census/CensusColumnMarriedWithinYear.php
+++ b/app/Census/CensusColumnMarriedWithinYear.php
@@ -31,7 +31,7 @@ class CensusColumnMarriedWithinYear extends AbstractCensusColumn implements Cens
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getSpouseFamilies() as $family) {
             foreach ($family->getFacts('MARR') as $fact) {
diff --git a/app/Census/CensusColumnMonthIfBornWithinYear.php b/app/Census/CensusColumnMonthIfBornWithinYear.php
index 6f2cc82fd0..0b3781a4e8 100644
--- a/app/Census/CensusColumnMonthIfBornWithinYear.php
+++ b/app/Census/CensusColumnMonthIfBornWithinYear.php
@@ -31,7 +31,7 @@ class CensusColumnMonthIfBornWithinYear extends AbstractCensusColumn implements
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $birth_jd  = $individual->getBirthDate()->julianDay();
         $census_jd = $this->date()->julianDay();
diff --git a/app/Census/CensusColumnMonthIfMarriedWithinYear.php b/app/Census/CensusColumnMonthIfMarriedWithinYear.php
index 7760360c75..0ab422a591 100644
--- a/app/Census/CensusColumnMonthIfMarriedWithinYear.php
+++ b/app/Census/CensusColumnMonthIfMarriedWithinYear.php
@@ -31,7 +31,7 @@ class CensusColumnMonthIfMarriedWithinYear extends AbstractCensusColumn implemen
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getSpouseFamilies() as $family) {
             foreach ($family->getFacts('MARR') as $fact) {
diff --git a/app/Census/CensusColumnMotherBirthPlace.php b/app/Census/CensusColumnMotherBirthPlace.php
index c87101514c..fa90ca9db4 100644
--- a/app/Census/CensusColumnMotherBirthPlace.php
+++ b/app/Census/CensusColumnMotherBirthPlace.php
@@ -31,7 +31,7 @@ class CensusColumnMotherBirthPlace extends AbstractCensusColumn implements Censu
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $mother = $this->mother($individual);
 
diff --git a/app/Census/CensusColumnMotherBirthPlaceSimple.php b/app/Census/CensusColumnMotherBirthPlaceSimple.php
index 16abf5b185..bed239a092 100644
--- a/app/Census/CensusColumnMotherBirthPlaceSimple.php
+++ b/app/Census/CensusColumnMotherBirthPlaceSimple.php
@@ -31,7 +31,7 @@ class CensusColumnMotherBirthPlaceSimple extends CensusColumnMotherBirthPlace im
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return $this->lastPartOfPlace(parent::generate($individual, $head));
     }
diff --git a/app/Census/CensusColumnMotherForeign.php b/app/Census/CensusColumnMotherForeign.php
index 8c2538ece9..ba85f48277 100644
--- a/app/Census/CensusColumnMotherForeign.php
+++ b/app/Census/CensusColumnMotherForeign.php
@@ -31,7 +31,7 @@ class CensusColumnMotherForeign extends AbstractCensusColumn implements CensusCo
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $mother = $this->mother($individual);
 
diff --git a/app/Census/CensusColumnNationality.php b/app/Census/CensusColumnNationality.php
index b9348f6d54..d801f162e0 100644
--- a/app/Census/CensusColumnNationality.php
+++ b/app/Census/CensusColumnNationality.php
@@ -41,7 +41,7 @@ class CensusColumnNationality extends AbstractCensusColumn implements CensusColu
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $place = $individual->getBirthPlace()->getGedcomName();
 
diff --git a/app/Census/CensusColumnNull.php b/app/Census/CensusColumnNull.php
index cd0f7a2aae..5370c3848f 100644
--- a/app/Census/CensusColumnNull.php
+++ b/app/Census/CensusColumnNull.php
@@ -31,7 +31,7 @@ class CensusColumnNull extends AbstractCensusColumn implements CensusColumnInter
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return '';
     }
diff --git a/app/Census/CensusColumnOccupation.php b/app/Census/CensusColumnOccupation.php
index 4ae76d6c28..bd821ca3d8 100644
--- a/app/Census/CensusColumnOccupation.php
+++ b/app/Census/CensusColumnOccupation.php
@@ -31,7 +31,7 @@ class CensusColumnOccupation extends AbstractCensusColumn implements CensusColum
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getFacts('OCCU') as $fact) {
             return $fact->getValue();
diff --git a/app/Census/CensusColumnRelationToHead.php b/app/Census/CensusColumnRelationToHead.php
index 0bb84d80dc..28ca153e00 100644
--- a/app/Census/CensusColumnRelationToHead.php
+++ b/app/Census/CensusColumnRelationToHead.php
@@ -32,7 +32,7 @@ class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusC
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($head === null || $individual === $head) {
             return 'head';
diff --git a/app/Census/CensusColumnRelationToHeadGerman.php b/app/Census/CensusColumnRelationToHeadGerman.php
index eb1e3fcb5e..8325bb1984 100644
--- a/app/Census/CensusColumnRelationToHeadGerman.php
+++ b/app/Census/CensusColumnRelationToHeadGerman.php
@@ -32,7 +32,7 @@ class CensusColumnRelationToHeadGerman extends AbstractCensusColumn implements C
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         if ($head === null || $individual === $head) {
             return 'Haushaltungsvorstand';
diff --git a/app/Census/CensusColumnReligion.php b/app/Census/CensusColumnReligion.php
index 7edb41d97b..a8a0e273f4 100644
--- a/app/Census/CensusColumnReligion.php
+++ b/app/Census/CensusColumnReligion.php
@@ -33,7 +33,7 @@ class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnI
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         return '';
     }
diff --git a/app/Census/CensusColumnSexMF.php b/app/Census/CensusColumnSexMF.php
index 0b88a728b0..64726e45aa 100644
--- a/app/Census/CensusColumnSexMF.php
+++ b/app/Census/CensusColumnSexMF.php
@@ -37,7 +37,7 @@ class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInte
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         switch ($individual->getSex()) {
             case 'M':
diff --git a/app/Census/CensusColumnSurname.php b/app/Census/CensusColumnSurname.php
index 8a573004f2..73c60dfdfe 100644
--- a/app/Census/CensusColumnSurname.php
+++ b/app/Census/CensusColumnSurname.php
@@ -31,7 +31,7 @@ class CensusColumnSurname extends AbstractCensusColumn implements CensusColumnIn
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getAllNames() as $name) {
             return $name['surname'];
diff --git a/app/Census/CensusColumnSurnameGivenNameInitial.php b/app/Census/CensusColumnSurnameGivenNameInitial.php
index 0cd4eddefc..3ba5859fdf 100644
--- a/app/Census/CensusColumnSurnameGivenNameInitial.php
+++ b/app/Census/CensusColumnSurnameGivenNameInitial.php
@@ -31,7 +31,7 @@ class CensusColumnSurnameGivenNameInitial extends CensusColumnFullName
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $name  = $this->nameAtCensusDate($individual, $this->date());
         $given = $name['givn'];
diff --git a/app/Census/CensusColumnSurnameGivenNames.php b/app/Census/CensusColumnSurnameGivenNames.php
index dbfee57bde..626ba180a9 100644
--- a/app/Census/CensusColumnSurnameGivenNames.php
+++ b/app/Census/CensusColumnSurnameGivenNames.php
@@ -31,7 +31,7 @@ class CensusColumnSurnameGivenNames extends AbstractCensusColumn implements Cens
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         foreach ($individual->getAllNames() as $name) {
             return $name['surname'] . ', ' . $name['givn'];
diff --git a/app/Census/CensusColumnYearsMarried.php b/app/Census/CensusColumnYearsMarried.php
index 182caad3fa..7df8d20b9e 100644
--- a/app/Census/CensusColumnYearsMarried.php
+++ b/app/Census/CensusColumnYearsMarried.php
@@ -32,7 +32,7 @@ class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusCol
      *
      * @return string
      */
-    public function generate(Individual $individual, Individual $head = null)
+    public function generate(Individual $individual, Individual $head)
     {
         $marriage_date = null;
 
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
index 759f1584e7..2a344c061c 100644
--- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -45,7 +45,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -63,7 +63,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
-        $this->assertSame('30', $column->generate($individual));
+        $this->assertSame('30', $column->generate($individual, $individual));
     }
 
     /**
@@ -81,7 +81,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
-        $this->assertSame('30', $column->generate($individual));
+        $this->assertSame('30', $column->generate($individual, $individual));
     }
 
     /**
@@ -99,7 +99,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
-        $this->assertSame('0', $column->generate($individual));
+        $this->assertSame('0', $column->generate($individual, $individual));
     }
 
     /**
@@ -117,7 +117,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
-        $this->assertSame('14', $column->generate($individual));
+        $this->assertSame('14', $column->generate($individual, $individual));
     }
 
     /**
@@ -135,6 +135,6 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale5Years($census, '', '');
 
-        $this->assertSame('40', $column->generate($individual));
+        $this->assertSame('40', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php
index 9600212032..c72fb4de6e 100644
--- a/tests/app/Census/CensusColumnAgeFemaleTest.php
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -45,7 +45,7 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -63,7 +63,7 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
-        $this->assertSame('32', $column->generate($individual));
+        $this->assertSame('32', $column->generate($individual, $individual));
     }
 
     /**
@@ -81,7 +81,7 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
-        $this->assertSame('32', $column->generate($individual));
+        $this->assertSame('32', $column->generate($individual, $individual));
     }
 
     /**
@@ -99,6 +99,6 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeFemale($census, '', '');
 
-        $this->assertSame('0', $column->generate($individual));
+        $this->assertSame('0', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
index 08f7edd470..9d22094d4c 100644
--- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -47,7 +47,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
-        $this->assertSame('30', $column->generate($individual));
+        $this->assertSame('30', $column->generate($individual, $individual));
     }
 
     /**
@@ -63,7 +63,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -81,7 +81,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
-        $this->assertSame('30', $column->generate($individual));
+        $this->assertSame('30', $column->generate($individual, $individual));
     }
 
     /**
@@ -99,7 +99,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
-        $this->assertSame('0', $column->generate($individual));
+        $this->assertSame('0', $column->generate($individual, $individual));
     }
 
     /**
@@ -117,7 +117,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
-        $this->assertSame('14', $column->generate($individual));
+        $this->assertSame('14', $column->generate($individual, $individual));
     }
 
     /**
@@ -135,6 +135,6 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale5Years($census, '', '');
 
-        $this->assertSame('40', $column->generate($individual));
+        $this->assertSame('40', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php
index 87b3741eba..651718d7a1 100644
--- a/tests/app/Census/CensusColumnAgeMaleTest.php
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -47,7 +47,7 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale($census, '', '');
 
-        $this->assertSame('32', $column->generate($individual));
+        $this->assertSame('32', $column->generate($individual, $individual));
     }
 
     /**
@@ -63,7 +63,7 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -81,7 +81,7 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale($census, '', '');
 
-        $this->assertSame('32', $column->generate($individual));
+        $this->assertSame('32', $column->generate($individual, $individual));
     }
 
     /**
@@ -99,6 +99,6 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMale($census, '', '');
 
-        $this->assertSame('0', $column->generate($individual));
+        $this->assertSame('0', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 1a1d85bdf4..1317211a39 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -53,7 +53,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMarried($census, '', '');
 
-        $this->assertSame(19, $column->generate($individual));
+        $this->assertSame(19, $column->generate($individual, $individual));
     }
 
     /**
@@ -71,7 +71,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -92,7 +92,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -110,6 +110,6 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAgeMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php
index c3243757ab..12cd5b0b30 100644
--- a/tests/app/Census/CensusColumnAgeTest.php
+++ b/tests/app/Census/CensusColumnAgeTest.php
@@ -46,6 +46,6 @@ class CensusColumnAgeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnAge($census, '', '');
 
-        $this->assertSame('32', $column->generate($individual));
+        $this->assertSame('32', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php
index b4c0db850c..9ac27299a8 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -51,6 +51,6 @@ class CensusColumnBirthDateTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthDate($census, '', '');
 
-        $this->assertSame('1 1 1800', $column->generate($individual));
+        $this->assertSame('1 1 1800', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
index ce4cdc904c..65b1a223b1 100644
--- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
@@ -53,6 +53,6 @@ class CensusColumnBirthDayDotMonthYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthDayDotMonthYear($census, '', '');
 
-        $this->assertSame('30. June 1832', $column->generate($individual));
+        $this->assertSame('30. June 1832', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php
index fe65ff1207..f934a521de 100644
--- a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php
@@ -53,6 +53,6 @@ class CensusColumnBirthDayMonthSlashYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthDayMonthSlashYear($census, '', '');
 
-        $this->assertSame('30 Jun/1832', $column->generate($individual));
+        $this->assertSame('30 Jun/1832', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
index 4e80150e20..a2c0165f31 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -53,6 +53,6 @@ class CensusColumnBirthDaySlashMonthTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthDaySlashMonth($census, '', '');
 
-        $this->assertSame('30/6', $column->generate($individual));
+        $this->assertSame('30/6', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
index 947c0ddce4..a6a9b46239 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -53,6 +53,6 @@ class CensusColumnBirthDaySlashMonthYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthDaySlashMonthYear($census, '', '');
 
-        $this->assertSame('30/6 1832', $column->generate($individual));
+        $this->assertSame('30/6 1832', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php
index b4ce9f64e1..c18e694104 100644
--- a/tests/app/Census/CensusColumnBirthDayTest.php
+++ b/tests/app/Census/CensusColumnBirthDayTest.php
@@ -51,6 +51,6 @@ class CensusColumnBirthDayTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthDay($census, '', '');
 
-        $this->assertSame('30', $column->generate($individual));
+        $this->assertSame('30', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php
index 1c122f8b34..ff38247f92 100644
--- a/tests/app/Census/CensusColumnBirthMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthTest.php
@@ -51,6 +51,6 @@ class CensusColumnBirthMonthTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthMonth($census, '', '');
 
-        $this->assertSame('Jan', $column->generate($individual));
+        $this->assertSame('Jan', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
index f6e01fa0d5..de3f649855 100644
--- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
@@ -60,7 +60,7 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
 
-        $this->assertSame('England', $column->generate($individual));
+        $this->assertSame('England', $column->generate($individual, $individual));
     }
 
     /**
@@ -77,7 +77,7 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -94,7 +94,7 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
 
-        $this->assertSame('Maryland', $column->generate($individual));
+        $this->assertSame('Maryland', $column->generate($individual, $individual));
     }
 
     /**
@@ -111,6 +111,6 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlaceSimple($census, '', '');
 
-        $this->assertSame('Florida', $column->generate($individual));
+        $this->assertSame('Florida', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php
index c2d126d775..f5615e9fd6 100644
--- a/tests/app/Census/CensusColumnBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceTest.php
@@ -60,7 +60,7 @@ class CensusColumnBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlace($census, '', '');
 
-        $this->assertSame('Westminster, London', $column->generate($individual));
+        $this->assertSame('Westminster, London', $column->generate($individual, $individual));
     }
 
     /**
@@ -77,7 +77,7 @@ class CensusColumnBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlace($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -94,6 +94,6 @@ class CensusColumnBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthPlace($census, '', '');
 
-        $this->assertSame('Paris, France', $column->generate($individual));
+        $this->assertSame('Paris, France', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php
index 27cda0a541..ab09dff7c7 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -51,6 +51,6 @@ class CensusColumnBirthYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBirthYear($census, '', '');
 
-        $this->assertSame('1800', $column->generate($individual));
+        $this->assertSame('1800', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php
index 828d38e119..03afe01c0d 100644
--- a/tests/app/Census/CensusColumnBornForeignPartsTest.php
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -63,7 +63,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -80,7 +80,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -97,7 +97,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -114,7 +114,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('I', $column->generate($individual));
+        $this->assertSame('I', $column->generate($individual, $individual));
     }
 
     /**
@@ -131,7 +131,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('F', $column->generate($individual));
+        $this->assertSame('F', $column->generate($individual, $individual));
     }
 
     /**
@@ -148,7 +148,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('E', $column->generate($individual));
+        $this->assertSame('E', $column->generate($individual, $individual));
     }
 
     /**
@@ -165,7 +165,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('E', $column->generate($individual));
+        $this->assertSame('E', $column->generate($individual, $individual));
     }
 
     /**
@@ -182,7 +182,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -199,7 +199,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -216,7 +216,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('F', $column->generate($individual));
+        $this->assertSame('F', $column->generate($individual, $individual));
     }
 
     /**
@@ -233,7 +233,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('E', $column->generate($individual));
+        $this->assertSame('E', $column->generate($individual, $individual));
     }
 
     /**
@@ -250,7 +250,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('E', $column->generate($individual));
+        $this->assertSame('E', $column->generate($individual, $individual));
     }
 
     /**
@@ -267,7 +267,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -284,7 +284,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('I', $column->generate($individual));
+        $this->assertSame('I', $column->generate($individual, $individual));
     }
 
     /**
@@ -301,7 +301,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('F', $column->generate($individual));
+        $this->assertSame('F', $column->generate($individual, $individual));
     }
 
     /**
@@ -318,7 +318,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -335,7 +335,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -352,7 +352,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -369,7 +369,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('I', $column->generate($individual));
+        $this->assertSame('I', $column->generate($individual, $individual));
     }
 
     /**
@@ -386,7 +386,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('F', $column->generate($individual));
+        $this->assertSame('F', $column->generate($individual, $individual));
     }
 
     /**
@@ -403,7 +403,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -420,7 +420,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -437,6 +437,6 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnBornForeignParts($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
index 373573d848..ba1eed03cd 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -45,7 +45,7 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -91,6 +91,6 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnChildrenBornAlive($census, '', '');
 
-        $this->assertSame('3', $column->generate($individual));
+        $this->assertSame('3', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php
index 0df9c15706..2ae24b23bb 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -45,7 +45,7 @@ class CensusColumnChildrenDiedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnChildrenDied($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -91,6 +91,6 @@ class CensusColumnChildrenDiedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnChildrenDied($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php
index e2bf8a4ef2..5cd8f72acb 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -45,7 +45,7 @@ class CensusColumnChildrenLivingTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnChildrenLiving($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -91,6 +91,6 @@ class CensusColumnChildrenLivingTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnChildrenLiving($census, '', '');
 
-        $this->assertSame('2', $column->generate($individual));
+        $this->assertSame('2', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 998d73e6a6..c46ea28a50 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionDanish($census, '', '');
 
-        $this->assertSame('Ugift', $column->generate($individual));
+        $this->assertSame('Ugift', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionDanish($census, '', '');
 
-        $this->assertSame('Ugift', $column->generate($individual));
+        $this->assertSame('Ugift', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Ugift', $column->generate($individual));
+        $this->assertSame('Ugift', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Ugift', $column->generate($individual));
+        $this->assertSame('Ugift', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Gift', $column->generate($individual));
+        $this->assertSame('Gift', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Gift', $column->generate($individual));
+        $this->assertSame('Gift', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionDanish($census, '', '');
 
-        $this->assertSame('Ugift', $column->generate($individual));
+        $this->assertSame('Ugift', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionDanish($census, '', '');
 
-        $this->assertSame('Ugift', $column->generate($individual));
+        $this->assertSame('Ugift', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionDanish($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionDanish($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Skilt', $column->generate($individual));
+        $this->assertSame('Skilt', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionDanish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Skilt', $column->generate($individual));
+        $this->assertSame('Skilt', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index c629932f49..e100ef8e04 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionEnglish($census, '', '');
 
-        $this->assertSame('Unm', $column->generate($individual));
+        $this->assertSame('Unm', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionEnglish($census, '', '');
 
-        $this->assertSame('Unm', $column->generate($individual));
+        $this->assertSame('Unm', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Unm', $column->generate($individual));
+        $this->assertSame('Unm', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Unm', $column->generate($individual));
+        $this->assertSame('Unm', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Wid', $column->generate($individual));
+        $this->assertSame('Wid', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Wid', $column->generate($individual));
+        $this->assertSame('Wid', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionEnglish($census, '', '');
 
-        $this->assertSame('Unm', $column->generate($individual));
+        $this->assertSame('Unm', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionEnglish($census, '', '');
 
-        $this->assertSame('Unm', $column->generate($individual));
+        $this->assertSame('Unm', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionEnglish($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionEnglish($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Div', $column->generate($individual));
+        $this->assertSame('Div', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionEnglish($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('Div', $column->generate($individual));
+        $this->assertSame('Div', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index d8f4b110b2..d10a0d6ca4 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFemme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 71dd357040..16f2abdcd1 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchFille($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchFille($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index dd8d8a93f3..b1fcc374bc 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchGarcon($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index 701dcb9a9a..1dd9c7923c 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchHomme($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index de476bf41f..34d808dbff 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuf($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index ee3ddcac3d..13aa9a84b9 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('1', $column->generate($individual));
+        $this->assertSame('1', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionFrenchVeuve($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 6a3c56474c..6102f754d7 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -48,7 +48,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionUs($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -67,7 +67,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionUs($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -90,7 +90,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -113,7 +113,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -142,7 +142,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('W', $column->generate($individual));
+        $this->assertSame('W', $column->generate($individual, $individual));
     }
 
     /**
@@ -171,7 +171,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('W', $column->generate($individual));
+        $this->assertSame('W', $column->generate($individual, $individual));
     }
 
     /**
@@ -194,7 +194,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionUs($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -217,7 +217,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionUs($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -240,7 +240,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionUs($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -263,7 +263,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnConditionUs($census, '', '');
 
-        $this->assertSame('S', $column->generate($individual));
+        $this->assertSame('S', $column->generate($individual, $individual));
     }
 
     /**
@@ -288,7 +288,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('D', $column->generate($individual));
+        $this->assertSame('D', $column->generate($individual, $individual));
     }
 
     /**
@@ -313,6 +313,6 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase
         $column = new CensusColumnConditionUs($census, '', '');
         $census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
-        $this->assertSame('D', $column->generate($individual));
+        $this->assertSame('D', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
index e89a2040a7..c4ebcafccc 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
@@ -69,6 +69,6 @@ class CensusColumnFatherBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherBirthPlaceSimple($census, '', '');
 
-        $this->assertSame('Florida', $column->generate($individual));
+        $this->assertSame('Florida', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
index e0a50b9037..94fde273fc 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
@@ -69,7 +69,7 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
 
-        $this->assertSame('London', $column->generate($individual));
+        $this->assertSame('London', $column->generate($individual, $individual));
     }
 
     /**
@@ -92,7 +92,7 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
 
-        $this->assertSame('London, England', $column->generate($individual));
+        $this->assertSame('London, England', $column->generate($individual, $individual));
     }
 
     /**
@@ -112,7 +112,7 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -129,6 +129,6 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherBirthPlace($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php
index 570ff5ca10..aaee42f282 100644
--- a/tests/app/Census/CensusColumnFatherForeignTest.php
+++ b/tests/app/Census/CensusColumnFatherForeignTest.php
@@ -66,7 +66,7 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherForeign($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -89,7 +89,7 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherForeign($census, '', '');
 
-        $this->assertSame('Y', $column->generate($individual));
+        $this->assertSame('Y', $column->generate($individual, $individual));
     }
 
     /**
@@ -109,7 +109,7 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherForeign($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -126,6 +126,6 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFatherForeign($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index 3cb861d77e..1785a40972 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -46,6 +46,6 @@ class CensusColumnFullNameTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnFullName($census, '', '');
 
-        $this->assertSame('Joe Bloggs', $column->generate($individual));
+        $this->assertSame('Joe Bloggs', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index bd76f0466a..85c97a72b6 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -44,7 +44,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
-        $this->assertSame('Joe', $column->generate($individual));
+        $this->assertSame('Joe', $column->generate($individual, $individual));
     }
 
     /**
@@ -60,7 +60,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
-        $this->assertSame('Joe F', $column->generate($individual));
+        $this->assertSame('Joe F', $column->generate($individual, $individual));
     }
 
     /**
@@ -76,6 +76,6 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnGivenNameInitial($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index 95cd829a99..c78c0adbac 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -44,7 +44,7 @@ class CensusColumnGivenNamesTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnGivenNames($census, '', '');
 
-        $this->assertSame('Joe', $column->generate($individual));
+        $this->assertSame('Joe', $column->generate($individual, $individual));
     }
 
     /**
@@ -60,6 +60,6 @@ class CensusColumnGivenNamesTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnGivenNames($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index a850a7f3f1..f608d7ff8f 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -52,7 +52,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
 
-        $this->assertSame('Y', $column->generate($individual));
+        $this->assertSame('Y', $column->generate($individual, $individual));
     }
 
     /**
@@ -75,7 +75,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -98,7 +98,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -118,7 +118,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -135,6 +135,6 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
index 98be4925bd..aaf323613b 100644
--- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
@@ -46,7 +46,7 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
 
-        $this->assertSame('Jan', $column->generate($individual));
+        $this->assertSame('Jan', $column->generate($individual, $individual));
     }
 
     /**
@@ -63,7 +63,7 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -81,7 +81,7 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
 
@@ -99,6 +99,6 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMonthIfBornWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index 8f2014d300..4f8c758671 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -52,7 +52,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
 
-        $this->assertSame('Dec', $column->generate($individual));
+        $this->assertSame('Dec', $column->generate($individual, $individual));
     }
 
     /**
@@ -75,7 +75,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -98,7 +98,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -118,7 +118,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -135,6 +135,6 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa
 
         $column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
index 7a646b3642..a7554aca86 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
@@ -69,6 +69,6 @@ class CensusColumnMotherBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherBirthPlaceSimple($census, '', '');
 
-        $this->assertSame('Florida', $column->generate($individual));
+        $this->assertSame('Florida', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
index 3fae6e72b4..c6ad42f4bd 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
@@ -69,7 +69,7 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
 
-        $this->assertSame('London', $column->generate($individual));
+        $this->assertSame('London', $column->generate($individual, $individual));
     }
 
     /**
@@ -92,7 +92,7 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
 
-        $this->assertSame('London, England', $column->generate($individual));
+        $this->assertSame('London, England', $column->generate($individual, $individual));
     }
 
     /**
@@ -112,7 +112,7 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -129,6 +129,6 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherBirthPlace($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php
index d21169b138..3354adaf69 100644
--- a/tests/app/Census/CensusColumnMotherForeignTest.php
+++ b/tests/app/Census/CensusColumnMotherForeignTest.php
@@ -66,7 +66,7 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherForeign($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -89,7 +89,7 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherForeign($census, '', '');
 
-        $this->assertSame('Y', $column->generate($individual));
+        $this->assertSame('Y', $column->generate($individual, $individual));
     }
 
     /**
@@ -109,7 +109,7 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherForeign($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -126,6 +126,6 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnMotherForeign($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 3618079acd..55d4942f21 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -62,7 +62,7 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnNationality($census, '', '');
 
-        $this->assertSame('Deutsch', $column->generate($individual));
+        $this->assertSame('Deutsch', $column->generate($individual, $individual));
     }
 
     /**
@@ -80,7 +80,7 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnNationality($census, '', '');
 
-        $this->assertSame('Australia', $column->generate($individual));
+        $this->assertSame('Australia', $column->generate($individual, $individual));
     }
 
     /**
@@ -98,7 +98,7 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnNationality($census, '', '');
 
-        $this->assertSame('British', $column->generate($individual));
+        $this->assertSame('British', $column->generate($individual, $individual));
     }
 
     /**
@@ -134,6 +134,6 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnNationality($census, '', '');
 
-        $this->assertSame('United States', $column->generate($individual));
+        $this->assertSame('United States', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php
index 4f8682971c..d4443ec996 100644
--- a/tests/app/Census/CensusColumnNullTest.php
+++ b/tests/app/Census/CensusColumnNullTest.php
@@ -43,6 +43,6 @@ class CensusColumnNullTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnNull($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 22fb195f1b..cb466af73a 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -44,7 +44,7 @@ class CensusColumnOccupationTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnOccupation($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -63,6 +63,6 @@ class CensusColumnOccupationTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnOccupation($census, '', '');
 
-        $this->assertSame('Farmer', $column->generate($individual));
+        $this->assertSame('Farmer', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
index 31837707de..5c57b38120 100644
--- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php
@@ -43,6 +43,6 @@ class CensusColumnRelationToHeadGermanTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnRelationToHeadGerman($census, '', '');
 
-        $this->assertSame('Haushaltungsvorstand', $column->generate($individual));
+        $this->assertSame('Haushaltungsvorstand', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php
index d567fd1b45..5214daf224 100644
--- a/tests/app/Census/CensusColumnRelationToHeadTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadTest.php
@@ -43,6 +43,6 @@ class CensusColumnRelationToHeadTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnRelationToHead($census, '', '');
 
-        $this->assertSame('head', $column->generate($individual));
+        $this->assertSame('head', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 34f022889c..2a8eca4d8e 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -44,6 +44,6 @@ class CensusColumnReligionTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnReligion($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php
index 66233f087a..67a652e6b4 100644
--- a/tests/app/Census/CensusColumnSexMFTest.php
+++ b/tests/app/Census/CensusColumnSexMFTest.php
@@ -44,7 +44,7 @@ class CensusColumnSexMFTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMF($census, '', '');
 
-        $this->assertSame('M', $column->generate($individual));
+        $this->assertSame('M', $column->generate($individual, $individual));
     }
 
     /**
@@ -60,7 +60,7 @@ class CensusColumnSexMFTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMF($census, '', '');
 
-        $this->assertSame('F', $column->generate($individual));
+        $this->assertSame('F', $column->generate($individual, $individual));
     }
 
     /**
@@ -76,6 +76,6 @@ class CensusColumnSexMFTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMF($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
index 50b257591f..6e8ac20681 100644
--- a/tests/app/Census/CensusColumnSexMKTest.php
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -44,7 +44,7 @@ class CensusColumnSexMKTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMK($census, '', '');
 
-        $this->assertSame('M', $column->generate($individual));
+        $this->assertSame('M', $column->generate($individual, $individual));
     }
 
     /**
@@ -60,7 +60,7 @@ class CensusColumnSexMKTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMK($census, '', '');
 
-        $this->assertSame('K', $column->generate($individual));
+        $this->assertSame('K', $column->generate($individual, $individual));
     }
 
     /**
@@ -76,6 +76,6 @@ class CensusColumnSexMKTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMK($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php
index d0839ec31e..e3563b5a8f 100644
--- a/tests/app/Census/CensusColumnSexMZTest.php
+++ b/tests/app/Census/CensusColumnSexMZTest.php
@@ -44,7 +44,7 @@ class CensusColumnSexMZTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMZ($census, '', '');
 
-        $this->assertSame('M', $column->generate($individual));
+        $this->assertSame('M', $column->generate($individual, $individual));
     }
 
     /**
@@ -60,7 +60,7 @@ class CensusColumnSexMZTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMZ($census, '', '');
 
-        $this->assertSame('Ž', $column->generate($individual));
+        $this->assertSame('Ž', $column->generate($individual, $individual));
     }
 
     /**
@@ -76,6 +76,6 @@ class CensusColumnSexMZTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSexMZ($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index 967f1dc5f9..48857a632d 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -51,7 +51,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit\Framework\TestCas
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
 
-        $this->assertSame('Sixpack, Joe', $column->generate($individual));
+        $this->assertSame('Sixpack, Joe', $column->generate($individual, $individual));
     }
 
     /**
@@ -74,6 +74,6 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit\Framework\TestCas
 
         $column = new CensusColumnSurnameGivenNameInitial($census, '', '');
 
-        $this->assertSame('Sixpack, Joe F', $column->generate($individual));
+        $this->assertSame('Sixpack, Joe F', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
index 8912e62303..749a879de5 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php
@@ -51,7 +51,7 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
 
-        $this->assertSame('Sixpack, Joe', $column->generate($individual));
+        $this->assertSame('Sixpack, Joe', $column->generate($individual, $individual));
     }
 
     /**
@@ -74,7 +74,7 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
 
-        $this->assertSame('Sixpack, Joe Fred', $column->generate($individual));
+        $this->assertSame('Sixpack, Joe Fred', $column->generate($individual, $individual));
     }
 
     /**
@@ -92,6 +92,6 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSurnameGivenNames($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php
index 27fed2df04..72e180b7c3 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -44,7 +44,7 @@ class CensusColumnSurnameTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSurname($census, '', '');
 
-        $this->assertSame('Bloggs', $column->generate($individual));
+        $this->assertSame('Bloggs', $column->generate($individual, $individual));
     }
 
     /**
@@ -60,6 +60,6 @@ class CensusColumnSurnameTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnSurname($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index 2d86fa8134..a3e66c1fc3 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -46,7 +46,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnYearsMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -66,7 +66,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnYearsMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -89,7 +89,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnYearsMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -112,7 +112,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnYearsMarried($census, '', '');
 
-        $this->assertSame('', $column->generate($individual));
+        $this->assertSame('', $column->generate($individual, $individual));
     }
 
     /**
@@ -135,6 +135,6 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase
 
         $column = new CensusColumnYearsMarried($census, '', '');
 
-        $this->assertSame('8', $column->generate($individual));
+        $this->assertSame('8', $column->generate($individual, $individual));
     }
 }