Census definitions

16 files changed, 379 insertions, 25 deletions

diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php
index 9b40555d89..49158c1cff 100644
--- a/tests/app/Census/CensusOfEngland1871Test.php
+++ b/tests/app/Census/CensusOfEngland1871Test.php
@@ -51,5 +51,23 @@ class CensusOfEngland1871Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Birthplace', $columns[6]->abbreviation());
+		$this->assertSame('Infirm', $columns[7]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Where born', $columns[6]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php
index b5638876ab..3db8c4c97d 100644
--- a/tests/app/Census/CensusOfEngland1881Test.php
+++ b/tests/app/Census/CensusOfEngland1881Test.php
@@ -51,5 +51,23 @@ class CensusOfEngland1881Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]); // Infirm, etc.
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Birthplace', $columns[6]->abbreviation());
+		$this->assertSame('Infirm', $columns[7]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Where born', $columns[6]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php
index 80cc04bfe3..061eb7381e 100644
--- a/tests/app/Census/CensusOfEngland1891Test.php
+++ b/tests/app/Census/CensusOfEngland1891Test.php
@@ -54,5 +54,29 @@ class CensusOfEngland1891Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Empl', $columns[6]->abbreviation());
+		$this->assertSame('Empd', $columns[7]->abbreviation());
+		$this->assertSame('OAC', $columns[8]->abbreviation());
+		$this->assertSame('Birthplace', $columns[9]->abbreviation());
+		$this->assertSame('Infirm', $columns[10]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Employer', $columns[6]->title());
+		$this->assertSame('Employed', $columns[7]->title());
+		$this->assertSame('Own account', $columns[8]->title());
+		$this->assertSame('Where born', $columns[9]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, lunatic or imbecile', $columns[10]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php
index eb5e7fcde1..274ac95e0b 100644
--- a/tests/app/Census/CensusOfEngland1901Test.php
+++ b/tests/app/Census/CensusOfEngland1901Test.php
@@ -53,5 +53,27 @@ class CensusOfEngland1901Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Emp', $columns[6]->abbreviation());
+		$this->assertSame('Home', $columns[7]->abbreviation());
+		$this->assertSame('Birthplace', $columns[8]->abbreviation());
+		$this->assertSame('Infirm', $columns[9]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Employer, worker or own account', $columns[6]->title());
+		$this->assertSame('Working at home', $columns[7]->title());
+		$this->assertSame('Where born', $columns[8]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded', $columns[9]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php
index 90f42e703a..85c044c300 100644
--- a/tests/app/Census/CensusOfEngland1911Test.php
+++ b/tests/app/Census/CensusOfEngland1911Test.php
@@ -59,5 +59,39 @@ class CensusOfEngland1911Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[13]);
 		$this->assertInstanceOf(CensusColumnNationality::class, $columns[14]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('AgeM', $columns[2]->abbreviation());
+		$this->assertSame('AgeF', $columns[3]->abbreviation());
+		$this->assertSame('Condition', $columns[4]->abbreviation());
+		$this->assertSame('YrM', $columns[5]->abbreviation());
+		$this->assertSame('ChA', $columns[6]->abbreviation());
+		$this->assertSame('ChL', $columns[7]->abbreviation());
+		$this->assertSame('ChD', $columns[8]->abbreviation());
+		$this->assertSame('Occupation', $columns[9]->abbreviation());
+		$this->assertSame('Ind', $columns[10]->abbreviation());
+		$this->assertSame('Emp', $columns[11]->abbreviation());
+		$this->assertSame('Home', $columns[12]->abbreviation());
+		$this->assertSame('Birthplace', $columns[13]->abbreviation());
+		$this->assertSame('Nat', $columns[14]->abbreviation());
+		$this->assertSame('Infirm', $columns[15]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Age (males)', $columns[2]->title());
+		$this->assertSame('Age (females)', $columns[3]->title());
+		$this->assertSame('Condition', $columns[4]->title());
+		$this->assertSame('Years married', $columns[5]->title());
+		$this->assertSame('Children born alive', $columns[6]->title());
+		$this->assertSame('Children who are still alive', $columns[7]->title());
+		$this->assertSame('Children who have died', $columns[8]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[9]->title());
+		$this->assertSame('Industry', $columns[10]->title());
+		$this->assertSame('Employer, worker or own account', $columns[11]->title());
+		$this->assertSame('Working at home', $columns[12]->title());
+		$this->assertSame('Where born', $columns[13]->title());
+		$this->assertSame('Nationality', $columns[14]->title());
+		$this->assertSame('Infirmity', $columns[15]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php
index 4556962152..98d2fdf7e9 100644
--- a/tests/app/Census/CensusOfScotland1861Test.php
+++ b/tests/app/Census/CensusOfScotland1861Test.php
@@ -42,7 +42,7 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfScotland1861;
 		$columns = $census->columns();
 
-		$this->assertCount(10, $columns);
+		$this->assertCount(9, $columns);
 		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
 		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
 		$this->assertInstanceOf(CensusColumnCondition::class, $columns[2]);
@@ -52,7 +52,6 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
@@ -63,7 +62,6 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase {
 		$this->assertSame('Birthplace', $columns[6]->abbreviation());
 		$this->assertSame('Infirm', $columns[7]->abbreviation());
 		$this->assertSame('Sch', $columns[8]->abbreviation());
-		$this->assertSame('Win', $columns[9]->abbreviation());
 
 		$this->assertSame('Name and surname', $columns[0]->title());
 		$this->assertSame('Relation to head of household', $columns[1]->title());
@@ -73,7 +71,6 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase {
 		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
 		$this->assertSame('Where born', $columns[6]->title());
 		$this->assertSame('Whether blind or deaf-and-dumb', $columns[7]->title());
-		$this->assertSame('Number of children between 5 and 15 attending school', $columns[8]->title());
-		$this->assertSame('Number of rooms with one or more windows', $columns[9]->title());
+		$this->assertSame('Number of children between 5 and 13 attending school', $columns[8]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php
index 6e129bc5e6..1ade69f8c3 100644
--- a/tests/app/Census/CensusOfScotland1871Test.php
+++ b/tests/app/Census/CensusOfScotland1871Test.php
@@ -42,7 +42,7 @@ class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfScotland1871;
 		$columns = $census->columns();
 
-		$this->assertCount(10, $columns);
+		$this->assertCount(9, $columns);
 		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
 		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
 		$this->assertInstanceOf(CensusColumnCondition::class, $columns[2]);
@@ -52,6 +52,25 @@ class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Birthplace', $columns[6]->abbreviation());
+		$this->assertSame('Infirm', $columns[7]->abbreviation());
+		$this->assertSame('Sch', $columns[8]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Where born', $columns[6]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title());
+		$this->assertSame('Number of children between 5 and 13 attending school or educated at home', $columns[8]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php
index 5d18068d01..93f164ad43 100644
--- a/tests/app/Census/CensusOfScotland1881Test.php
+++ b/tests/app/Census/CensusOfScotland1881Test.php
@@ -42,7 +42,7 @@ class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfScotland1881;
 		$columns = $census->columns();
 
-		$this->assertCount(9, $columns);
+		$this->assertCount(8, $columns);
 		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
 		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
 		$this->assertInstanceOf(CensusColumnCondition::class, $columns[2]);
@@ -50,7 +50,24 @@ class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
 		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]); // Infirm, etc.
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]); // Rooms with windows.
+		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Birthplace', $columns[6]->abbreviation());
+		$this->assertSame('Infirm', $columns[7]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Where born', $columns[6]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php
index bb565516b7..c3185e7193 100644
--- a/tests/app/Census/CensusOfScotland1891Test.php
+++ b/tests/app/Census/CensusOfScotland1891Test.php
@@ -42,7 +42,7 @@ class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfScotland1891;
 		$columns = $census->columns();
 
-		$this->assertCount(13, $columns);
+		$this->assertCount(12, $columns);
 		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
 		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
 		$this->assertInstanceOf(CensusColumnCondition::class, $columns[2]);
@@ -55,6 +55,31 @@ class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Empl', $columns[6]->abbreviation());
+		$this->assertSame('Empd', $columns[7]->abbreviation());
+		$this->assertSame('OAC', $columns[8]->abbreviation());
+		$this->assertSame('Birthplace', $columns[9]->abbreviation());
+		$this->assertSame('Lang', $columns[10]->abbreviation());
+		$this->assertSame('Infirm', $columns[11]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Employer', $columns[6]->title());
+		$this->assertSame('Employed', $columns[7]->title());
+		$this->assertSame('Own account', $columns[8]->title());
+		$this->assertSame('Where born', $columns[9]->title());
+		$this->assertSame('Language spoken', $columns[10]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, lunatic or imbecile', $columns[11]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php
index ffec516a71..29b4a65f0e 100644
--- a/tests/app/Census/CensusOfScotland1901Test.php
+++ b/tests/app/Census/CensusOfScotland1901Test.php
@@ -42,7 +42,7 @@ class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfScotland1901;
 		$columns = $census->columns();
 
-		$this->assertCount(12, $columns);
+		$this->assertCount(11, $columns);
 		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
 		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
 		$this->assertInstanceOf(CensusColumnCondition::class, $columns[2]);
@@ -54,6 +54,29 @@ class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Emp', $columns[6]->abbreviation());
+		$this->assertSame('Home', $columns[7]->abbreviation());
+		$this->assertSame('Birthplace', $columns[8]->abbreviation());
+		$this->assertSame('Lang', $columns[9]->abbreviation());
+		$this->assertSame('Infirm', $columns[10]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Employer, worker or own account', $columns[6]->title());
+		$this->assertSame('Working at home', $columns[7]->title());
+		$this->assertSame('Where born', $columns[8]->title());
+		$this->assertSame('Language spoken', $columns[9]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded', $columns[10]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php
index b1aaed2a35..06e7710f37 100644
--- a/tests/app/Census/CensusOfScotland1911Test.php
+++ b/tests/app/Census/CensusOfScotland1911Test.php
@@ -42,22 +42,59 @@ class CensusOfScotland1911Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfScotland1911;
 		$columns = $census->columns();
 
-		$this->assertCount(16, $columns);
+		$this->assertCount(17, $columns);
 		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
 		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
 		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]);
 		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnCondition::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf(CensusColumnNull::class, $columns[4]);
+		$this->assertInstanceOf(CensusColumnCondition::class, $columns[5]);
+		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]);
+		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]);
+		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]);
+		$this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[9]);
+		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[10]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
+		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
+		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[14]);
+		$this->assertInstanceOf(CensusColumnNationality::class, $columns[15]);
+		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('AgeM', $columns[2]->abbreviation());
+		$this->assertSame('AgeF', $columns[3]->abbreviation());
+		$this->assertSame('Lang', $columns[4]->abbreviation());
+		$this->assertSame('Condition', $columns[5]->abbreviation());
+		$this->assertSame('YrM', $columns[6]->abbreviation());
+		$this->assertSame('ChA', $columns[7]->abbreviation());
+		$this->assertSame('ChL', $columns[8]->abbreviation());
+		$this->assertSame('ChD', $columns[9]->abbreviation());
+		$this->assertSame('Occupation', $columns[10]->abbreviation());
+		$this->assertSame('Ind', $columns[11]->abbreviation());
+		$this->assertSame('Emp', $columns[12]->abbreviation());
+		$this->assertSame('Home', $columns[13]->abbreviation());
+		$this->assertSame('Birthplace', $columns[14]->abbreviation());
+		$this->assertSame('Nat', $columns[15]->abbreviation());
+		$this->assertSame('Infirm', $columns[16]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Age (males)', $columns[2]->title());
+		$this->assertSame('Age (females)', $columns[3]->title());
+		$this->assertSame('Language spoken', $columns[4]->title());
+		$this->assertSame('Condition', $columns[5]->title());
+		$this->assertSame('Years married', $columns[6]->title());
+		$this->assertSame('Children born alive', $columns[7]->title());
+		$this->assertSame('Children who are still alive', $columns[8]->title());
+		$this->assertSame('Children who have died', $columns[9]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[10]->title());
+		$this->assertSame('Industry', $columns[11]->title());
+		$this->assertSame('Employer, worker or own account', $columns[12]->title());
+		$this->assertSame('Working at home', $columns[13]->title());
+		$this->assertSame('Where born', $columns[14]->title());
+		$this->assertSame('Nationality', $columns[15]->title());
+		$this->assertSame('Infirmity', $columns[16]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php
index 6f8bc233ac..04e985fad2 100644
--- a/tests/app/Census/CensusOfWales1871Test.php
+++ b/tests/app/Census/CensusOfWales1871Test.php
@@ -51,5 +51,23 @@ class CensusOfWales1871Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Birthplace', $columns[6]->abbreviation());
+		$this->assertSame('Infirm', $columns[7]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Where born', $columns[6]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php
index 999c4b4732..837ea93e8d 100644
--- a/tests/app/Census/CensusOfWales1881Test.php
+++ b/tests/app/Census/CensusOfWales1881Test.php
@@ -51,5 +51,23 @@ class CensusOfWales1881Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Birthplace', $columns[6]->abbreviation());
+		$this->assertSame('Infirm', $columns[7]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Where born', $columns[6]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php
index ff0add8209..b230a5509c 100644
--- a/tests/app/Census/CensusOfWales1891Test.php
+++ b/tests/app/Census/CensusOfWales1891Test.php
@@ -54,5 +54,29 @@ class CensusOfWales1891Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Empl', $columns[6]->abbreviation());
+		$this->assertSame('Empd', $columns[7]->abbreviation());
+		$this->assertSame('OAC', $columns[8]->abbreviation());
+		$this->assertSame('Birthplace', $columns[9]->abbreviation());
+		$this->assertSame('Infirm', $columns[10]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Employer', $columns[6]->title());
+		$this->assertSame('Employed', $columns[7]->title());
+		$this->assertSame('Own account', $columns[8]->title());
+		$this->assertSame('Where born', $columns[9]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, lunatic or imbecile', $columns[10]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php
index 6862be1ec4..228d8ffa32 100644
--- a/tests/app/Census/CensusOfWales1901Test.php
+++ b/tests/app/Census/CensusOfWales1901Test.php
@@ -54,5 +54,29 @@ class CensusOfWales1901Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('Condition', $columns[2]->abbreviation());
+		$this->assertSame('AgeM', $columns[3]->abbreviation());
+		$this->assertSame('AgeF', $columns[4]->abbreviation());
+		$this->assertSame('Occupation', $columns[5]->abbreviation());
+		$this->assertSame('Emp', $columns[6]->abbreviation());
+		$this->assertSame('Home', $columns[7]->abbreviation());
+		$this->assertSame('Birthplace', $columns[8]->abbreviation());
+		$this->assertSame('Infirm', $columns[9]->abbreviation());
+		$this->assertSame('Lang', $columns[10]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Condition', $columns[2]->title());
+		$this->assertSame('Age (males)', $columns[3]->title());
+		$this->assertSame('Age (females)', $columns[4]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[5]->title());
+		$this->assertSame('Employer, worker or own account', $columns[6]->title());
+		$this->assertSame('Working at home', $columns[7]->title());
+		$this->assertSame('Where born', $columns[8]->title());
+		$this->assertSame('Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded', $columns[9]->title());
+		$this->assertSame('Language spoken', $columns[10]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php
index 878959cb82..e4e4411875 100644
--- a/tests/app/Census/CensusOfWales1911Test.php
+++ b/tests/app/Census/CensusOfWales1911Test.php
@@ -60,5 +60,41 @@ class CensusOfWales1911Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf(CensusColumnNationality::class, $columns[14]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
 		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
+
+		$this->assertSame('Name', $columns[0]->abbreviation());
+		$this->assertSame('Relation', $columns[1]->abbreviation());
+		$this->assertSame('AgeM', $columns[2]->abbreviation());
+		$this->assertSame('AgeF', $columns[3]->abbreviation());
+		$this->assertSame('Condition', $columns[4]->abbreviation());
+		$this->assertSame('YrM', $columns[5]->abbreviation());
+		$this->assertSame('ChA', $columns[6]->abbreviation());
+		$this->assertSame('ChL', $columns[7]->abbreviation());
+		$this->assertSame('ChD', $columns[8]->abbreviation());
+		$this->assertSame('Occupation', $columns[9]->abbreviation());
+		$this->assertSame('Ind', $columns[10]->abbreviation());
+		$this->assertSame('Emp', $columns[11]->abbreviation());
+		$this->assertSame('Home', $columns[12]->abbreviation());
+		$this->assertSame('Birthplace', $columns[13]->abbreviation());
+		$this->assertSame('Nat', $columns[14]->abbreviation());
+		$this->assertSame('Infirm', $columns[15]->abbreviation());
+		$this->assertSame('Lang', $columns[16]->abbreviation());
+
+		$this->assertSame('Name and surname', $columns[0]->title());
+		$this->assertSame('Relation to head of household', $columns[1]->title());
+		$this->assertSame('Age (males)', $columns[2]->title());
+		$this->assertSame('Age (females)', $columns[3]->title());
+		$this->assertSame('Condition', $columns[4]->title());
+		$this->assertSame('Years married', $columns[5]->title());
+		$this->assertSame('Children born alive', $columns[6]->title());
+		$this->assertSame('Children who are still alive', $columns[7]->title());
+		$this->assertSame('Children who have died', $columns[8]->title());
+		$this->assertSame('Rank, profession or occupation', $columns[9]->title());
+		$this->assertSame('Industry', $columns[10]->title());
+		$this->assertSame('Employer, worker or own account', $columns[11]->title());
+		$this->assertSame('Working at home', $columns[12]->title());
+		$this->assertSame('Where born', $columns[13]->title());
+		$this->assertSame('Nationality', $columns[14]->title());
+		$this->assertSame('Infirmity', $columns[15]->title());
+		$this->assertSame('Language spoken', $columns[16]->title());
 	}
 }